14f8ab
From eb784a40a4f72e347945e0d66ac1a28389bb076c Mon Sep 17 00:00:00 2001
14f8ab
From: Jiffin Tony Thottan <jthottan@redhat.com>
14f8ab
Date: Fri, 28 Apr 2017 17:27:46 +0530
14f8ab
Subject: [PATCH 062/124] glusterd/ganesha : perform removal of ganesha.conf on
14f8ab
 nodes only in ganesha cluster
14f8ab
14f8ab
Label: DOWNSTREAM ONLY
14f8ab
14f8ab
Change-Id: I864ecd9391adf80fb1fa6ad2f9891a9ce77135e7
14f8ab
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
14f8ab
Reviewed-on: https://review.gluster.org/17138
14f8ab
Smoke: Gluster Build System <jenkins@build.gluster.org>
14f8ab
Reviewed-by: soumya k <skoduri@redhat.com>
14f8ab
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
14f8ab
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
14f8ab
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
14f8ab
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/167147
14f8ab
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
14f8ab
---
14f8ab
 xlators/mgmt/glusterd/src/glusterd-ganesha.c | 19 +++++++++----------
14f8ab
 1 file changed, 9 insertions(+), 10 deletions(-)
14f8ab
14f8ab
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
14f8ab
index ee8b588..b743216 100644
14f8ab
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
14f8ab
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
14f8ab
@@ -746,17 +746,16 @@ stop_ganesha(char **op_errstr)
14f8ab
         0,
14f8ab
     };
14f8ab
 
14f8ab
-    runinit(&runner);
14f8ab
-    runner_add_args(&runner, GANESHA_PREFIX "/ganesha-ha.sh",
14f8ab
-                    "--setup-ganesha-conf-files", CONFDIR, "no", NULL);
14f8ab
-    ret = runner_run(&runner);
14f8ab
-    if (ret) {
14f8ab
-        gf_asprintf(op_errstr,
14f8ab
-                    "removal of symlink ganesha.conf "
14f8ab
-                    "in /etc/ganesha failed");
14f8ab
-    }
14f8ab
-
14f8ab
     if (check_host_list()) {
14f8ab
+        runinit(&runner);
14f8ab
+        runner_add_args(&runner, GANESHA_PREFIX "/ganesha-ha.sh",
14f8ab
+                        "--setup-ganesha-conf-files", CONFDIR, "no", NULL);
14f8ab
+        ret = runner_run(&runner);
14f8ab
+        if (ret) {
14f8ab
+            gf_asprintf(op_errstr,
14f8ab
+                        "removal of symlink ganesha.conf "
14f8ab
+                        "in /etc/ganesha failed");
14f8ab
+        }
14f8ab
         ret = manage_service("stop");
14f8ab
         if (ret)
14f8ab
             gf_asprintf(op_errstr,
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab