diff options
| author | Jiffin Tony Thottan <jthottan@redhat.com> | 2017-04-28 17:27:46 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-05-01 01:37:36 +0000 |
| commit | eb247da4ef06e6b93c1bbe987ee76176781aa68a (patch) | |
| tree | 090541a72d0fd8daf9da6d600e9ce02b194efd2d | |
| parent | 5888e2f7f3e3cea0cd02059c5548743185998e86 (diff) | |
glusterd/ganesha : perform removal of ganesha.conf on nodes only in ganesha cluster
Change-Id: I864ecd9391adf80fb1fa6ad2f9891a9ce77135e7
BUG: 1401877
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: https://review.gluster.org/17138
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: soumya k <skoduri@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index 64c3d0f6c80..f709469b36d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -740,17 +740,18 @@ stop_ganesha (char **op_errstr) { int ret = 0; runner_t runner = {0,}; - runinit (&runner); - runner_add_args (&runner, - GANESHA_PREFIX"/ganesha-ha.sh", - "--setup-ganesha-conf-files", CONFDIR, "no", NULL); - ret = runner_run (&runner); - if (ret) { - gf_asprintf (op_errstr, "removal of symlink ganesha.conf " - "in /etc/ganesha failed"); - } - if (check_host_list ()) { + runinit (&runner); + runner_add_args (&runner, + GANESHA_PREFIX"/ganesha-ha.sh", + "--setup-ganesha-conf-files", CONFDIR, + "no", NULL); + ret = runner_run (&runner); + if (ret) { + gf_asprintf (op_errstr, "removal of symlink ganesha.conf " + "in /etc/ganesha failed"); + } + ret = manage_service ("stop"); if (ret) gf_asprintf (op_errstr, "NFS-Ganesha service could not" |