diff options
| author | Meghana Madhusudhan <mmadhusu@redhat.com> | 2015-06-12 19:25:26 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2015-06-16 04:12:28 -0700 |
| commit | e88985e2e5959970f49cc135f9f00104d6e4dadc (patch) | |
| tree | 6513d074d0ad54aac8ed56e9dc8a6d5a49cd99de /xlators | |
| parent | b3c9fdacce4057e1ca8275dd095782ac4004dd92 (diff) | |
NFS-Ganesha : Return correct return value
When any of the nodes in the trusted pool is not listed
in the cluster node list, it receives a wrong return
value. And commit fails on that host. Fixing the same.
This is the backport of the fix merged on master.
http://review.gluster.org/#/c/11205/
Change-Id: I1a5c80ff012e56919842d1bf967b71c363a68061
BUG: 1232143
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
Reviewed-on: http://review.gluster.org/11243
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index d4ab77ca5f9..40a74cd81c2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -671,7 +671,9 @@ pre_setup (char **op_errstr) goto out; } - if (check_host_list()) { + ret = check_host_list(); + + if (ret) { ret = setup_cluster(); if (ret == -1) gf_asprintf (op_errstr, "Failed to set up HA " |