From 7cc14db79d4579cfa50c30108fdf67ffa61cb94a Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Thu, 19 Apr 2012 14:10:44 +0530 Subject: glusterd,glusterfsd : Perform proper cleanup of connections and socket files Perform proper disconnections and cleanup in glusterd on stopping nfs-server and self-heal daemon processes to prevent glusterd from opening unneded unix domain socket connections. glusterfsd processes will cleanup the socket files properly in cleanup_and_exit() to prevent junk socket files. Also, fix rpcsvc_program_unregister() to preform the unregistering properly. Change-Id: I1c7302c1166cf43feba1c7a813c3dc10169dc53a BUG: 810089 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.com/3168 Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi --- glusterfsd/src/glusterfsd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'glusterfsd/src/glusterfsd.c') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 7bc063b2fee..4ad47ec621a 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -198,6 +198,7 @@ int glusterfs_pidfile_cleanup (glusterfs_ctx_t *ctx); int glusterfs_volumes_init (glusterfs_ctx_t *ctx); int glusterfs_mgmt_init (glusterfs_ctx_t *ctx); int glusterfs_listener_init (glusterfs_ctx_t *ctx); +int glusterfs_listener_stop (glusterfs_ctx_t *ctx); int create_fuse_mount (glusterfs_ctx_t *ctx) @@ -798,7 +799,7 @@ cleanup_and_exit (int signum) ctx->cleanup_started = 1; glusterfs_mgmt_pmap_signout (ctx); if (ctx->listener) { - ctx->listener = NULL; + (void) glusterfs_listener_stop (ctx); } /* Call fini() of FUSE xlator first: -- cgit