From 4413ccd6818a8680c74bc072b784319ce8d8429f Mon Sep 17 00:00:00 2001 From: Sanju Rakonde Date: Thu, 9 Nov 2017 13:15:51 +0530 Subject: [PATCH 514/529] 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. upstream patch: https://review.gluster.org/#/c/glusterfs/+/18703/ >Change-Id: I926ebdffab330ccef844f23f6d6556e137914047 >BUG: 1511339 >Signed-off-by: Sanju Rakonde Change-Id: I926ebdffab330ccef844f23f6d6556e137914047 BUG: 1574490 Signed-off-by: Sanju Rakonde Reviewed-on: https://code.engineering.redhat.com/gerrit/162399 Tested-by: RHGS Build Bot Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- xlators/mgmt/glusterd/src/glusterd-utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index e21ec4e..bafc3af 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -5204,6 +5204,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"); -- 1.8.3.1