From 5e808f3a5dfa3fba58ff0206775de2653d62b2de Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Fri, 28 Nov 2014 10:46:20 +0530
Subject: glusterd/uss: if snapd is not running, return success from
 glusterd_handle_snapd_option.

glusterd_handle_snapd_option was returning failure if snapd is not running
because of which gluster commands were failing.

Change-Id: I22286f4ecf28b57dfb6fb8ceb52ca8bdc66aec5d
BUG: 1175765
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/9206
Reviewed-by: Kaushal M <kaushal@redhat.com>
Reviewed-by: Avra Sengupta <asengupt@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/9311
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
---
 .../bugs/bug-1168803-snapd-option-validation-fix.t | 30 ++++++++++++++++++++++
 xlators/mgmt/glusterd/src/glusterd-utils.c         |  3 +++
 2 files changed, 33 insertions(+)
 create mode 100755 tests/bugs/bug-1168803-snapd-option-validation-fix.t

diff --git a/tests/bugs/bug-1168803-snapd-option-validation-fix.t b/tests/bugs/bug-1168803-snapd-option-validation-fix.t
new file mode 100755
index 00000000000..e29cbe43db6
--- /dev/null
+++ b/tests/bugs/bug-1168803-snapd-option-validation-fix.t
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+## Test case for BZ-1168803 - snapd option validation should not fail if the
+#snapd is not running
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+## Start glusterd
+TEST glusterd;
+TEST pidof glusterd;
+
+## create volume
+TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
+TEST $CLI volume set $V0 features.uss enable
+
+## Now set another volume option, this should not fail
+TEST $CLI volume set $V0 features.file-snapshot on
+
+## start the volume
+TEST $CLI volume start $V0
+
+## Kill snapd daemon and then try to stop the volume which should not fail
+kill $(ps aux | grep glusterfsd | grep snapd | awk '{print $2}')
+
+TEST $CLI volume stop $V0
+
+cleanup;
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index bd58b0ef1bc..d4521679d86 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -13499,6 +13499,9 @@ glusterd_handle_snapd_option (glusterd_volinfo_t *volinfo)
                                                 "Couldn't stop snapd for "
                                                 "volume: %s",
                                                 volinfo->volname);
+                        } else {
+                                /* Since snapd is not running set ret to 0 */
+                                ret = 0;
                         }
                         goto out;
                 }
-- 
cgit