|
 |
21ab4e |
From 1623c1e9e27e01c04681b6a032844d9e5e3f605a Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Date: Fri, 28 Apr 2017 17:27:46 +0530
|
|
|
21ab4e |
Subject: [PATCH 426/426] glusterd/ganesha : perform removal of ganesha.conf on
|
|
|
21ab4e |
nodes only in ganesha cluster
|
|
|
21ab4e |
|
|
|
21ab4e |
Upstream reference :
|
|
|
21ab4e |
>Change-Id: I864ecd9391adf80fb1fa6ad2f9891a9ce77135e7
|
|
|
21ab4e |
>BUG: 1401877
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/17138
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Icf42d996a3eb072c686c2433b188d12afdab3719
|
|
|
21ab4e |
BUG: 1400816
|
|
|
21ab4e |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/105741
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 19 ++++++++++---------
|
|
|
21ab4e |
1 file changed, 10 insertions(+), 9 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
index f74b784..574f4b9 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
@@ -757,16 +757,17 @@ stop_ganesha (char **op_errstr) {
|
|
|
21ab4e |
int ret = 0;
|
|
|
21ab4e |
runner_t runner = {0,};
|
|
|
21ab4e |
|
|
|
21ab4e |
- runinit (&runner);
|
|
|
21ab4e |
- runner_add_args (&runner, "sh", GANESHA_PREFIX"/ganesha-ha.sh",
|
|
|
21ab4e |
- "--setup-ganesha-conf-files", CONFDIR, "no", NULL);
|
|
|
21ab4e |
- ret = runner_run (&runner);
|
|
|
21ab4e |
- if (ret) {
|
|
|
21ab4e |
- gf_asprintf (op_errstr, "removal of symlink ganesha.conf "
|
|
|
21ab4e |
- "in /etc/ganesha failed");
|
|
|
21ab4e |
- }
|
|
|
21ab4e |
-
|
|
|
21ab4e |
if (check_host_list ()) {
|
|
|
21ab4e |
+ runinit (&runner);
|
|
|
21ab4e |
+ runner_add_args (&runner, "sh", GANESHA_PREFIX"/ganesha-ha.sh",
|
|
|
21ab4e |
+ "--setup-ganesha-conf-files", CONFDIR,
|
|
|
21ab4e |
+ "no", NULL);
|
|
|
21ab4e |
+ ret = runner_run (&runner);
|
|
|
21ab4e |
+ if (ret) {
|
|
|
21ab4e |
+ gf_asprintf (op_errstr, "removal of symlink ganesha.conf "
|
|
|
21ab4e |
+ "in /etc/ganesha failed");
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
+
|
|
|
21ab4e |
ret = manage_service ("stop");
|
|
|
21ab4e |
if (ret)
|
|
|
21ab4e |
gf_asprintf (op_errstr, "NFS-Ganesha service could not"
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|