From af6769675acbbfd780fa2ece8587502d6d579372 Mon Sep 17 00:00:00 2001 From: Rajesh Joseph Date: Tue, 13 Dec 2016 15:28:42 +0530 Subject: socket: socket disconnect should wait for poller thread exit When SSL is enabled or if "transport.socket.own-thread" option is set then socket_poller is run as different thread. Currently during disconnect or PARENT_DOWN scenario we don't wait for this thread to terminate. PARENT_DOWN will disconnect the socket layer and cleanup resources used by socket_poller. Therefore before disconnect we should wait for poller thread to exit. Change-Id: I71f984b47d260ffd979102f180a99a0bed29f0d6 BUG: 1404181 Signed-off-by: Rajesh Joseph Reviewed-on: http://review.gluster.org/16141 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kaushal M Reviewed-by: Raghavendra Talur Reviewed-by: Raghavendra G --- xlators/mgmt/glusterd/src/glusterd-handshake.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-handshake.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index dc772ca6f51..550ee2c10b3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -1824,7 +1824,7 @@ __glusterd_mgmt_hndsk_version_ack_cbk (struct rpc_req *req, struct iovec *iov, out: if (ret != 0 && peerinfo) - rpc_transport_disconnect (peerinfo->rpc->conn.trans); + rpc_transport_disconnect (peerinfo->rpc->conn.trans, _gf_false); rcu_read_unlock (); @@ -1949,7 +1949,8 @@ out: frame->local = NULL; STACK_DESTROY (frame->root); if (peerinfo) - rpc_transport_disconnect (peerinfo->rpc->conn.trans); + rpc_transport_disconnect (peerinfo->rpc->conn.trans, + _gf_false); } rcu_read_unlock (); @@ -2218,7 +2219,7 @@ __glusterd_peer_dump_version_cbk (struct rpc_req *req, struct iovec *iov, out: if (ret != 0 && peerinfo) - rpc_transport_disconnect (peerinfo->rpc->conn.trans); + rpc_transport_disconnect (peerinfo->rpc->conn.trans, _gf_false); rcu_read_unlock (); -- cgit