From 84348ad9b22be14841451191313614585da7777b Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Fri, 12 Jun 2015 19:25:26 +0530 Subject: [PATCH 078/101] NFS-Ganesha : Return corect 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. Change-Id: Iaa6efe23bade15efe38c4bcc7244ff1538fc30f2 BUG: 1225010 Signed-off-by: Meghana Madhusudhan Reviewed-on: https://code.engineering.redhat.com/gerrit/50761 Reviewed-by: Kaleb Keithley Tested-by: Soumya Koduri Reviewed-by: Soumya Koduri --- 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 d4ab77c..40a74cd 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 " -- 1.7.1