summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanju Rakonde <srakonde@redhat.com>2017-11-09 13:15:51 +0530
committerjiffin tony Thottan <jthottan@redhat.com>2017-11-30 06:46:02 +0000
commit4c9478b3604305e0e20c90096198b14dda83e3d0 (patch)
tree69765c439aae3a8323ef6782aeaaa23cc7b6dcda
parent3c39df42ffadb060b38b62d70eded285d650f08d (diff)
glusterd: display gluster volume status, when quorum type is server
Problem: when server-quorum-type is server, after restarting glusterd in the node which is up, gluster volume status is giving incorrect information. Fix: check whether server is blank, before adding other keys into the dictionary. Change-Id: I926ebdffab330ccef844f23f6d6556e137914047 BUG: 1511782 Signed-off-by: Sanju Rakonde <srakonde@redhat.com> (cherry picked from commit 046c7e3199fca715592762e271e6061ac99b0c4b)
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index c4681b2486c..dbc8775e0d4 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5031,6 +5031,12 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count,
* the brick as hostname+path, so this will make more sense
* when output.
*/
+
+ if (!strcmp(server, "")) {
+ ret = 0;
+ goto out;
+ }
+
snprintf (key, sizeof (key), "brick%d.hostname", count);
if (!strcmp (server, priv->nfs_svc.name))
ret = dict_set_str (dict, key, "NFS Server");