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