diff options
| author | Kaushal M <kaushal@redhat.com> | 2016-05-16 15:15:49 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2016-10-23 21:10:50 -0700 |
| commit | d4b993610c1ee64ab7c2f41cf457e63a3da7f521 (patch) | |
| tree | 5213c41c8d10b06d214d11d87985bdb79174b74a | |
| parent | d7a5ca16911caca03cec1112d4be56a9cda2ee30 (diff) | |
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 <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/14356
Tested-by: MOHIT AGRAWAL <moagrawa@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 89817b663df..257898865b4 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2565,10 +2565,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); |