msg: make listen backlog become a option, increase from 128 to 512

Fixes: http://tracker.ceph.com/issues/20330
Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index f8af42a675689920385cbfe3e883b364990a2588..dbecf1bb6b1eb2272c96e211266868e367c1fc0f 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -212,6 +212,7 @@ OPTION(ms_bind_retry_count, OPT_INT, 6) // If binding fails, how many times do w
 OPTION(ms_bind_retry_delay, OPT_INT, 6) // Delay between attemps to bind
 #endif
 OPTION(ms_bind_before_connect, OPT_BOOL, false)
+OPTION(ms_tcp_listen_backlog, OPT_INT, 512)
 OPTION(ms_rwthread_stack_bytes, OPT_U64, 1024 << 10)
 OPTION(ms_tcp_read_timeout, OPT_U64, 900)
 OPTION(ms_pq_max_tokens_per_priority, OPT_U64, 16777216)

diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index cf52db9a775cb73e83bbcbc94090a080a123747a..d0e6b5af0834789346bc510f4077773f9201cb43 100644 (file)
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -322,7 +322,7 @@ int PosixWorker::listen(entity_addr_t &sa, const SocketOptions &opt,
     return r;
   }
 
-  r = ::listen(listen_sd, 128);
+  r = ::listen(listen_sd, cct->_conf->ms_tcp_listen_backlog);
   if (r < 0) {
     r = -errno;
     lderr(cct) << __func__ << " unable to listen on " << sa << ": " << cpp_strerror(r) << dendl;

diff --git a/src/msg/async/rdma/RDMAServerSocketImpl.cc b/src/msg/async/rdma/RDMAServerSocketImpl.cc
index 8f5fd81d3dc751eab08adf86f2a031979c1c3dd3..8d9858c09826c15623565db95cd01e04c1983432 100644 (file)
--- a/src/msg/async/rdma/RDMAServerSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAServerSocketImpl.cc
@@ -56,7 +56,7 @@ int RDMAServerSocketImpl::listen(entity_addr_t &sa, const SocketOptions &opt)
     goto err;
   }
 
-  rc = ::listen(server_setup_socket, 128);
+  rc = ::listen(server_setup_socket, cct->_conf->ms_tcp_listen_backlog);
   if (rc < 0) {
     rc = -errno;
     lderr(cct) << __func__ << " unable to listen on " << sa << ": " << cpp_strerror(errno) << dendl;

diff --git a/src/msg/simple/Accepter.cc b/src/msg/simple/Accepter.cc
index 16e6dfbfa31b00cf24906c2bd9b88614044269e4..5779cc7abec69b8d52c66962e1092d56dbb6799e 100644 (file)
--- a/src/msg/simple/Accepter.cc
+++ b/src/msg/simple/Accepter.cc
@@ -211,7 +211,7 @@ int Accepter::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
   ldout(msgr->cct,10) <<  __func__ << " bound to " << listen_addr << dendl;
 
   // listen!
-  rc = ::listen(listen_sd, 128);
+  rc = ::listen(listen_sd, msgr->cct->_conf->ms_tcp_listen_backlog);
   if (rc < 0) {
     rc = -errno;
     lderr(msgr->cct) <<  __func__ << " unable to listen on " << listen_addr