|
 |
21ab4e |
From 4f489835aa5b6c8e1ac309836efa11e37391d0f7 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Date: Tue, 6 Dec 2016 15:53:10 +0530
|
|
|
21ab4e |
Subject: [PATCH 343/361] ganesha/glusterd : create 'ganesha.conf' symlink for
|
|
|
21ab4e |
nodes in ganesha cluster
|
|
|
21ab4e |
|
|
|
21ab4e |
mainline:
|
|
|
21ab4e |
> BUG: 1401877
|
|
|
21ab4e |
> Reviewed-on: http://review.gluster.org/16041
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
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 |
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
(cherry picked from commit 3a178cd823d428b7283150735c19cb569a3eb27d)
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1400816
|
|
|
21ab4e |
Change-Id: I27503558da176f0b1a1f0953a7e7ebe86976608d
|
|
|
21ab4e |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/101295
|
|
|
21ab4e |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
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 93c35c7..4a76e7e 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
@@ -819,16 +819,17 @@ start_ganesha (char **op_errstr)
|
|
|
21ab4e |
}
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
- runinit (&runner);
|
|
|
21ab4e |
- runner_add_args (&runner, "sh", GANESHA_PREFIX"/ganesha-ha.sh",
|
|
|
21ab4e |
- "--setup-ganesha-conf-files", CONFDIR, "yes", NULL);
|
|
|
21ab4e |
- ret = runner_run (&runner);
|
|
|
21ab4e |
- if (ret) {
|
|
|
21ab4e |
- gf_asprintf (op_errstr, "creation of symlink ganesha.conf "
|
|
|
21ab4e |
- "in /etc/ganesha failed");
|
|
|
21ab4e |
- goto out;
|
|
|
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, "yes",
|
|
|
21ab4e |
+ NULL);
|
|
|
21ab4e |
+ ret = runner_run (&runner);
|
|
|
21ab4e |
+ if (ret) {
|
|
|
21ab4e |
+ gf_asprintf (op_errstr, "creation of symlink ganesha.conf "
|
|
|
21ab4e |
+ "in /etc/ganesha failed");
|
|
|
21ab4e |
+ goto out;
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
ret = manage_service ("start");
|
|
|
21ab4e |
if (ret)
|
|
|
21ab4e |
gf_asprintf (op_errstr, "NFS-Ganesha failed to start."
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|