diff options
| author | Kaushal M <kaushal@redhat.com> | 2016-05-16 15:15:49 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2016-10-26 04:38:17 -0700 |
| commit | 3dde08333aeaa5491a42988e8115ab7b02c65184 (patch) | |
| tree | e4e38e61ff6c26da04be546ee7532f43a769f5eb | |
| parent | 401aec64b1aec4215651e9d04f264a83433dd06c (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>
Change-Id: I144e1f767cec8c6fc1aa46b00cd234129d2a4adc
BUG: 1336369
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/15704
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: lidi <lidi@estor.com.cn>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
| -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 8b49d824524..f66a45025df 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2537,10 +2537,17 @@ err: __socket_shutdown(this); 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); |