From 2fa5f7267801c3bff25f813ff6eb44305e56b0b5 Mon Sep 17 00:00:00 2001 From: vmallika Date: Tue, 5 Jan 2016 17:50:09 +0530 Subject: glusterd: register rpc notification for unix sockets Previously only CLI was using unix socket to connect to glusterd, and there was no need to register rpc callback notifications. Now auxiliary mount process is started with unix socket option. So we need to register register rpc notifications for unix sockets as well. Change-Id: I985839fc91c5c2674d85a7ec94ae24f47898c22d BUG: 1295763 Signed-off-by: vmallika Reviewed-on: http://review.gluster.org/13174 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri Tested-by: Pranith Kumar Karampuri --- xlators/mgmt/glusterd/src/glusterd.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'xlators/mgmt') diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index aaffebd7291..809fc5eead6 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -1029,17 +1029,6 @@ _install_mount_spec (dict_t *opts, char *key, data_t *value, void *data) } -int -glusterd_uds_rpcsvc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event, - void *data) -{ - /* glusterd_rpcsvc_notify() does stuff that calls coming in from the - * unix domain socket don't need. This is just an empty function to be - * used for the uds listener. This will be used later if required. - */ - return 0; -} - /* The glusterd unix domain socket listener only listens for cli */ rpcsvc_t * glusterd_init_uds_listener (xlator_t *this) @@ -1075,8 +1064,7 @@ glusterd_init_uds_listener (xlator_t *this) goto out; } - ret = rpcsvc_register_notify (rpc, glusterd_uds_rpcsvc_notify, - this); + ret = rpcsvc_register_notify (rpc, glusterd_rpcsvc_notify, this); if (ret) { gf_msg_debug (this->name, 0, "Failed to register notify function"); @@ -1140,8 +1128,7 @@ glusterd_stop_uds_listener (xlator_t *this) } (void) rpcsvc_unregister_notify (conf->uds_rpc, - glusterd_uds_rpcsvc_notify, - this); + glusterd_rpcsvc_notify, this); sock_data = dict_get (this->options, "glusterd-sockfile"); if (!sock_data) { -- cgit