From 4e46b44d2fed2766bb95c3daf6371650ca4a87ac Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Wed, 8 Jul 2015 14:18:19 +0530
Subject: [PATCH 217/234] glusterd/snapd: Stop snapd daemon when glusterd is restarting

Stop snapd daemon when glusterd is coming back, if uss
is disabled, or volume is stopped.

> Reviewed-on: http://review.gluster.org/11575
Change-Id: I4313ecaff19de30f3e9ea76881994509402ed5b0
BUG: 1240338
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/52635
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
---
 xlators/mgmt/glusterd/src/glusterd-utils.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 770cbf7..d2a110c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -3682,6 +3682,12 @@ glusterd_delete_stale_volume (glusterd_volinfo_t *stale_volinfo,
                 (void) gf_store_handle_destroy (stale_volinfo->shandle);
                 stale_volinfo->shandle = NULL;
         }
+
+        /* Marking volume as stopped, so that svc manager stops snapd
+         * and we are deleting the volume.
+         */
+        stale_volinfo->status = GLUSTERD_STATUS_STOPPED;
+
         if (!stale_volinfo->is_snap_volume) {
                 svc = &(stale_volinfo->snapd.svc);
                 (void) svc->manager (svc, stale_volinfo, PROC_START_NO_WAIT);
-- 
1.7.1