|
 |
cb8e9e |
From 4e46b44d2fed2766bb95c3daf6371650ca4a87ac Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Avra Sengupta <asengupt@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 8 Jul 2015 14:18:19 +0530
|
|
|
cb8e9e |
Subject: [PATCH 217/234] glusterd/snapd: Stop snapd daemon when glusterd is restarting
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Stop snapd daemon when glusterd is coming back, if uss
|
|
|
cb8e9e |
is disabled, or volume is stopped.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
> Reviewed-on: http://review.gluster.org/11575
|
|
|
cb8e9e |
Change-Id: I4313ecaff19de30f3e9ea76881994509402ed5b0
|
|
|
cb8e9e |
BUG: 1240338
|
|
|
cb8e9e |
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/52635
|
|
|
cb8e9e |
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
cb8e9e |
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/mgmt/glusterd/src/glusterd-utils.c | 6 ++++++
|
|
|
cb8e9e |
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
cb8e9e |
index 770cbf7..d2a110c 100644
|
|
|
cb8e9e |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
cb8e9e |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
cb8e9e |
@@ -3682,6 +3682,12 @@ glusterd_delete_stale_volume (glusterd_volinfo_t *stale_volinfo,
|
|
|
cb8e9e |
(void) gf_store_handle_destroy (stale_volinfo->shandle);
|
|
|
cb8e9e |
stale_volinfo->shandle = NULL;
|
|
|
cb8e9e |
}
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
+ /* Marking volume as stopped, so that svc manager stops snapd
|
|
|
cb8e9e |
+ * and we are deleting the volume.
|
|
|
cb8e9e |
+ */
|
|
|
cb8e9e |
+ stale_volinfo->status = GLUSTERD_STATUS_STOPPED;
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
if (!stale_volinfo->is_snap_volume) {
|
|
|
cb8e9e |
svc = &(stale_volinfo->snapd.svc);
|
|
|
cb8e9e |
(void) svc->manager (svc, stale_volinfo, PROC_START_NO_WAIT);
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|