glusterd: stop daemon services upon peer detach correctly

Problem:
Currently glusterd is stopping all the daemons service upon peer detach.
If user have multi node cluster and if user want to detach any node
from the cluster, and detached node having stand alone volume then upon
detaching glusterd stopping all the daemon's of the detached node,
which is having running volume.

Fix:
Upon peer detach it should do peer detach cleanup properly and it should
stop only those daemon on the node on which it require.

Change-Id: I98b8099166f82e235ded6d02261f59a6511a003b
BUG: 1287455
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/12838
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c
index d99662af584..1c342e8d8fb 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c
@@ -609,17 +609,6 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
 
         cds_list_for_each_entry_safe (volinfo, tmp_volinfo, &priv->volumes,
                                       vol_list) {
-                /* Stop snapd daemon service if snapd daemon is running*/
-                if (!volinfo->is_snap_volume) {
-                        svc = &(volinfo->snapd.svc);
-                        ret = svc->stop (svc, SIGTERM);
-                        if (ret) {
-                                gf_msg (THIS->name, GF_LOG_ERROR, 0,
-                                        GD_MSG_SVC_STOP_FAIL, "Failed to "
-                                        "stop snapd daemon service.");
-                        }
-                }
-
                 /* The peer detach checks make sure that, at this point in the
                  * detach process, there are only volumes contained completely
                  * within or completely outside the detached peer.
@@ -632,6 +621,17 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
                                 GD_MSG_STALE_VOL_DELETE_INFO,
                                 "Deleting stale volume %s", volinfo->volname);
 
+                        /*Stop snapd daemon service if snapd daemon is running*/
+                        if (!volinfo->is_snap_volume) {
+                                svc = &(volinfo->snapd.svc);
+                                ret = svc->stop (svc, SIGTERM);
+                                if (ret) {
+                                        gf_msg (THIS->name, GF_LOG_ERROR, 0,
+                                                GD_MSG_SVC_STOP_FAIL, "Failed "
+                                                "to stop snapd daemon service");
+                                }
+                        }
+
                         ret = glusterd_cleanup_snaps_for_volume (volinfo);
                         if (ret) {
                                 gf_msg (THIS->name, GF_LOG_ERROR, 0,
@@ -649,12 +649,12 @@ glusterd_peer_detach_cleanup (glusterd_conf_t *priv)
                 }
         }
 
-        /* Stop all daemon services of Detaching node once  peer detached */
-        ret = glusterd_svcs_stop ();
+        /*Reconfigure all daemon services upon peer detach*/
+        ret = glusterd_svcs_reconfigure ();
         if (ret) {
                 gf_msg (THIS->name, GF_LOG_ERROR, 0,
                         GD_MSG_SVC_STOP_FAIL,
-                        "Failed to stop all daemon services.");
+                        "Failed to reconfigure all daemon services.");
         }
 }