|
 |
cb8e9e |
From 84348ad9b22be14841451191313614585da7777b Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Meghana Madhusudhan <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Date: Fri, 12 Jun 2015 19:25:26 +0530
|
|
|
cb8e9e |
Subject: [PATCH 078/101] NFS-Ganesha : Return corect return value
|
|
|
cb8e9e |
|
|
|
cb8e9e |
When any of the nodes in the trusted pool is not listed
|
|
|
cb8e9e |
in the cluster node list, it receives a wrong return
|
|
|
cb8e9e |
value. And commit fails on that host. Fixing the same.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: Iaa6efe23bade15efe38c4bcc7244ff1538fc30f2
|
|
|
cb8e9e |
BUG: 1225010
|
|
|
cb8e9e |
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50761
|
|
|
cb8e9e |
Reviewed-by: Kaleb Keithley <kkeithle@redhat.com>
|
|
|
cb8e9e |
Tested-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 4 +++-
|
|
|
cb8e9e |
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
index d4ab77c..40a74cd 100644
|
|
|
cb8e9e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
cb8e9e |
@@ -671,7 +671,9 @@ pre_setup (char **op_errstr)
|
|
|
cb8e9e |
goto out;
|
|
|
cb8e9e |
}
|
|
|
cb8e9e |
|
|
|
cb8e9e |
- if (check_host_list()) {
|
|
|
cb8e9e |
+ ret = check_host_list();
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
+ if (ret) {
|
|
|
cb8e9e |
ret = setup_cluster();
|
|
|
cb8e9e |
if (ret == -1)
|
|
|
cb8e9e |
gf_asprintf (op_errstr, "Failed to set up HA "
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|