From f6d6ff4a01706b6c61507ad8775f08b6b99787b7 Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Thu, 10 Mar 2016 14:32:03 +0530
Subject: [PATCH 28/80] snapshot: Use svc->manager during glusterd restart

Instead of using svc->start, we should use svc->manager
as it takes care of initializing svc too, and both starts
and stops snapd as needed.

Change-Id: I3d3afdf4c4203bee3b790a017b820339fd376af6
BUG: 1289439
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/13665
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/70553
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
---
 tests/bugs/snapshot/bug-1316437.t              |   30 ++++++++++++++++++++++++
 xlators/mgmt/glusterd/src/glusterd-snapd-svc.c |    9 +++----
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 tests/bugs/snapshot/bug-1316437.t

diff --git a/tests/bugs/snapshot/bug-1316437.t b/tests/bugs/snapshot/bug-1316437.t
new file mode 100644
index 0000000..30a221e
--- /dev/null
+++ b/tests/bugs/snapshot/bug-1316437.t
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../snapshot.rc
+
+cleanup;
+
+TEST glusterd
+
+# Intentionally not carving lvms for this as we will not be taking
+# snapshots in this testcase
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3,4,5,6};
+
+TEST $CLI volume start $V0;
+
+TEST $CLI volume set $V0 features.uss enable;
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_if_snapd_exist
+
+killall glusterd glusterfsd glusterfs
+
+SNAPD_PID=$(ps auxww | grep snapd | grep -v grep | awk '{print $2}');
+TEST ! [ $SNAPD_PID -gt 0 ];
+
+glusterd
+
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' check_if_snapd_exist
+
+cleanup;
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c
index 993419c..71188eb 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c
@@ -359,15 +359,14 @@ glusterd_snapdsvc_restart ()
 
         cds_list_for_each_entry (volinfo, &conf->volumes, vol_list) {
                 /* Start per volume snapd svc */
-                if (volinfo->status == GLUSTERD_STATUS_STARTED &&
-                    glusterd_is_snapd_enabled (volinfo)) {
+                if (volinfo->status == GLUSTERD_STATUS_STARTED) {
                         svc = &(volinfo->snapd.svc);
-                        ret = svc->start (svc, PROC_START_NO_WAIT);
+                        ret = svc->manager (svc, volinfo, PROC_START_NO_WAIT);
                         if (ret) {
                                 gf_msg (this->name, GF_LOG_ERROR, 0,
                                         GD_MSG_SNAPD_START_FAIL,
-                                        "Couldn't start snapd for "
-                                        "vol: %s", volinfo->volname);
+                                        "Couldn't resolve snapd for "
+                                        "vol: %s on restart", volinfo->volname);
                                 goto out;
                         }
                 }
-- 
1.7.1