From 4d59c16154e794677bae61842e32fa8aef6d419f Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Mon, 16 May 2016 15:15:49 +0530 Subject: rpc/socket: Close pipe on disconnection Encrypted connections create a pipe, which isn't closed when the connection disconnects. This leaks fds, and gluster eventually ends up in a situation with fd starvation which leads to operation failures. > Change-Id: I144e1f767cec8c6fc1aa46b00cd234129d2a4adc > BUG: 1336371 > Signed-off-by: Kaushal M > Reviewed-on: http://review.gluster.org/14356 > Tested-by: MOHIT AGRAWAL > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Reviewed-by: Raghavendra G > Signed-off-by: Kaushal M Change-Id: I144e1f767cec8c6fc1aa46b00cd234129d2a4adc BUG: 1387960 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.org/15702 Tested-by: Atin Mukherjee CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Smoke: Gluster Build System Reviewed-by: Atin Mukherjee Reviewed-by: Raghavendra G --- rpc/rpc-transport/socket/src/socket.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'rpc/rpc-transport') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 8bda3810d89..8269b08279e 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2562,10 +2562,17 @@ err: __socket_teardown_connection (this); sys_close (priv->sock); priv->sock = -1; + + sys_close (priv->pipe[0]); + sys_close (priv->pipe[1]); + priv->pipe[0] = -1; + priv->pipe[1] = -1; + priv->ot_state = OT_IDLE; + pthread_mutex_unlock(&priv->lock); - rpc_transport_notify (this, RPC_TRANSPORT_DISCONNECT, this); + rpc_transport_notify (this, RPC_TRANSPORT_DISCONNECT, this); rpc_transport_unref (this); -- cgit