From d724a87e682cf14a3f2a85888cad5c5db203fb5b Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Fri, 15 Jul 2016 14:12:31 +0530 Subject: rpc/socket.c : Modify socket code to avoid fd leak in case of socket_poller thread Update socket code to avoid fd leak in case of socket_poller thread. Change-Id: Ifa9718fbaf065988a299cda7ba0282dfd6b10a32 BUG: 1356888 Signed-off-by: Mohit Agrawal Reviewed-on: http://review.gluster.org/14929 CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G NetBSD-regression: NetBSD Build System Smoke: Gluster Build System --- rpc/rpc-transport/socket/src/socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'rpc') diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 3aae10bd501..af496ffc8e2 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2786,8 +2786,6 @@ socket_server_event_handler (int fd, int idx, void *data, pthread_mutex_unlock (&new_priv->lock); if (ret == -1) { sys_close (new_sock); - GF_FREE (new_trans->name); - GF_FREE (new_trans); rpc_transport_unref (new_trans); goto unlock; } @@ -3108,8 +3106,9 @@ handler: if (ret) { gf_log(this->name, GF_LOG_ERROR, "could not spawn thread"); - sys_close(priv->pipe[0]); - sys_close(priv->pipe[1]); + sys_close (priv->pipe[0]); + sys_close (priv->pipe[1]); + sys_close (priv->sock); priv->sock = -1; } } -- cgit