From eb784a40a4f72e347945e0d66ac1a28389bb076c Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Fri, 28 Apr 2017 17:27:46 +0530 Subject: [PATCH 062/124] glusterd/ganesha : perform removal of ganesha.conf on nodes only in ganesha cluster Label: DOWNSTREAM ONLY Change-Id: I864ecd9391adf80fb1fa6ad2f9891a9ce77135e7 Signed-off-by: Jiffin Tony Thottan Reviewed-on: https://review.gluster.org/17138 Smoke: Gluster Build System Reviewed-by: soumya k NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kaleb KEITHLEY Signed-off-by: Jiffin Tony Thottan Reviewed-on: https://code.engineering.redhat.com/gerrit/167147 Reviewed-by: Soumya Koduri Tested-by: RHGS Build Bot Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- xlators/mgmt/glusterd/src/glusterd-ganesha.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index ee8b588..b743216 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -746,17 +746,16 @@ stop_ganesha(char **op_errstr) 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, -- 1.8.3.1