async: change set_socket_option caller

Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 6f7a38d0acc1a93db45a01bff08e58fc01237228..196a43ae03031f114e97a0a25038ee09e1df6592 100644 (file)
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1331,7 +1331,7 @@ ssize_t AsyncConnection::_process_connection()
         if (net.set_nonblock(sd) < 0)
           goto fail;
 
-        net.set_socket_options(sd);
+        net.set_socket_options(sd, async_msgr->cct->_conf->ms_tcp_nodelay, async_msgr->cct->_conf->ms_tcp_rcvbuf);
         net.set_priority(sd, async_msgr->get_socket_priority());
 
         bl.append(CEPH_BANNER, strlen(CEPH_BANNER));

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index df0f4a6c43a895b807eba3ce06be463ea9841c65..78251ff699666ee0c3b7fb4e39343681c73f6cfe 100644 (file)
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -105,7 +105,7 @@ int Processor::bind(const entity_addr_t &bind_addr, const set<int>& avoid_ports)
     return r;
   }
   net.set_close_on_exec(listen_sd);
-  net.set_socket_options(listen_sd);
+  net.set_socket_options(listen_sd, msgr->cct->_conf->ms_tcp_nodelay, msgr->cct->_conf->ms_tcp_rcvbuf);
 
   // use whatever user specified (if anything)
   entity_addr_t listen_addr = bind_addr;

diff --git a/src/msg/async/net_handler.cc b/src/msg/async/net_handler.cc
index 9a420d975770928df07bfb2f9d4a98fb00a1752f..d092a6609926f7a934c4186e43b228d80b27cc7e 100644 (file)
--- a/src/msg/async/net_handler.cc
+++ b/src/msg/async/net_handler.cc
@@ -161,7 +161,8 @@ int NetHandler::generic_connect(const entity_addr_t& addr, bool nonblock)
     }
   }
 
-  set_socket_options(s);
+  set_socket_options(s, cct->_conf->ms_tcp_nodelay, cct->_conf->ms_tcp_rcvbuf);
+
 
   ret = ::connect(s, addr.get_sockaddr(), addr.get_sockaddr_len());
   if (ret < 0) {