From f6879fea787d2de1c23584b9b45b26f4966b87c6 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Sun, 3 Jan 2016 17:54:36 +0800 Subject: [PATCH] async: change set_socket_option caller Signed-off-by: Haomai Wang --- src/msg/async/AsyncConnection.cc | 2 +- src/msg/async/AsyncMessenger.cc | 2 +- src/msg/async/net_handler.cc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 6f7a38d0acc..196a43ae030 100644 --- 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 df0f4a6c43a..78251ff6996 100644 --- 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& 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 9a420d97577..d092a660992 100644 --- 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) { -- 2.39.5