|
 |
d1681e |
From 06a24c4e6ec4d876bb5c9216a6b5f5364d58dc10 Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
d1681e |
Date: Fri, 28 Apr 2017 17:27:46 +0530
|
|
|
d1681e |
Subject: [PATCH 58/74] glusterd/ganesha : perform removal of ganesha.conf on
|
|
|
d1681e |
nodes only in ganesha cluster
|
|
|
d1681e |
|
|
|
d1681e |
Change-Id: I864ecd9391adf80fb1fa6ad2f9891a9ce77135e7
|
|
|
d1681e |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://review.gluster.org/17138
|
|
|
d1681e |
Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
d1681e |
Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
d1681e |
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
d1681e |
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
d1681e |
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 21 +++++++++++----------
|
|
|
d1681e |
1 file changed, 11 insertions(+), 10 deletions(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
d1681e |
index 38fa378..2392341 100644
|
|
|
d1681e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
d1681e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
d1681e |
@@ -740,17 +740,18 @@ stop_ganesha (char **op_errstr) {
|
|
|
d1681e |
int ret = 0;
|
|
|
d1681e |
runner_t runner = {0,};
|
|
|
d1681e |
|
|
|
d1681e |
- runinit (&runner);
|
|
|
d1681e |
- runner_add_args (&runner,
|
|
|
d1681e |
- GANESHA_PREFIX"/ganesha-ha.sh",
|
|
|
d1681e |
- "--setup-ganesha-conf-files", CONFDIR, "no", NULL);
|
|
|
d1681e |
- ret = runner_run (&runner);
|
|
|
d1681e |
- if (ret) {
|
|
|
d1681e |
- gf_asprintf (op_errstr, "removal of symlink ganesha.conf "
|
|
|
d1681e |
- "in /etc/ganesha failed");
|
|
|
d1681e |
- }
|
|
|
d1681e |
-
|
|
|
d1681e |
if (check_host_list ()) {
|
|
|
d1681e |
+ runinit (&runner);
|
|
|
d1681e |
+ runner_add_args (&runner,
|
|
|
d1681e |
+ GANESHA_PREFIX"/ganesha-ha.sh",
|
|
|
d1681e |
+ "--setup-ganesha-conf-files", CONFDIR,
|
|
|
d1681e |
+ "no", NULL);
|
|
|
d1681e |
+ ret = runner_run (&runner);
|
|
|
d1681e |
+ if (ret) {
|
|
|
d1681e |
+ gf_asprintf (op_errstr, "removal of symlink ganesha.conf "
|
|
|
d1681e |
+ "in /etc/ganesha failed");
|
|
|
d1681e |
+ }
|
|
|
d1681e |
+
|
|
|
d1681e |
ret = manage_service ("stop");
|
|
|
d1681e |
if (ret)
|
|
|
d1681e |
gf_asprintf (op_errstr, "NFS-Ganesha service could not"
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|