|
 |
887953 |
From 4413ccd6818a8680c74bc072b784319ce8d8429f Mon Sep 17 00:00:00 2001
|
|
|
887953 |
From: Sanju Rakonde <srakonde@redhat.com>
|
|
|
887953 |
Date: Thu, 9 Nov 2017 13:15:51 +0530
|
|
|
887953 |
Subject: [PATCH 514/529] glusterd: display gluster volume status, when quorum
|
|
|
887953 |
type is server
|
|
|
887953 |
|
|
|
887953 |
Problem: when server-quorum-type is server, after restarting glusterd
|
|
|
887953 |
in the node which is up, gluster volume status is giving incorrect
|
|
|
887953 |
information.
|
|
|
887953 |
|
|
|
887953 |
Fix: check whether server is blank, before adding other keys into the
|
|
|
887953 |
dictionary.
|
|
|
887953 |
|
|
|
887953 |
upstream patch: https://review.gluster.org/#/c/glusterfs/+/18703/
|
|
|
887953 |
|
|
|
887953 |
>Change-Id: I926ebdffab330ccef844f23f6d6556e137914047
|
|
|
887953 |
>BUG: 1511339
|
|
|
887953 |
>Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
887953 |
|
|
|
887953 |
Change-Id: I926ebdffab330ccef844f23f6d6556e137914047
|
|
|
887953 |
BUG: 1574490
|
|
|
887953 |
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
887953 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/162399
|
|
|
887953 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
887953 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
887953 |
---
|
|
|
887953 |
xlators/mgmt/glusterd/src/glusterd-utils.c | 6 ++++++
|
|
|
887953 |
1 file changed, 6 insertions(+)
|
|
|
887953 |
|
|
|
887953 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
887953 |
index e21ec4e..bafc3af 100644
|
|
|
887953 |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
887953 |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
887953 |
@@ -5204,6 +5204,12 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count,
|
|
|
887953 |
* the brick as hostname+path, so this will make more sense
|
|
|
887953 |
* when output.
|
|
|
887953 |
*/
|
|
|
887953 |
+
|
|
|
887953 |
+ if (!strcmp(server, "")) {
|
|
|
887953 |
+ ret = 0;
|
|
|
887953 |
+ goto out;
|
|
|
887953 |
+ }
|
|
|
887953 |
+
|
|
|
887953 |
snprintf (key, sizeof (key), "brick%d.hostname", count);
|
|
|
887953 |
if (!strcmp (server, priv->nfs_svc.name))
|
|
|
887953 |
ret = dict_set_str (dict, key, "NFS Server");
|
|
|
887953 |
--
|
|
|
887953 |
1.8.3.1
|
|
|
887953 |
|