17b94a
From 167980565e1ab56989b25fe6aa0203aeb7970c8b Mon Sep 17 00:00:00 2001
17b94a
From: Sanju Rakonde <srakonde@redhat.com>
17b94a
Date: Sun, 6 Oct 2019 19:05:28 +0530
17b94a
Subject: [PATCH 306/307] cli: fix distCount value
17b94a
17b94a
gluster volume info --xml id displaying wrong distCount
17b94a
value. This patch addresses it.
17b94a
17b94a
> fixes: bz#1758878
17b94a
> Change-Id: I64081597e06018361e6524587b433b0c4b2a0260
17b94a
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
17b94a
17b94a
upstream patch: https://review.gluster.org/#/c/glusterfs/+/23521/
17b94a
17b94a
BUG: 1758618
17b94a
Change-Id: I64081597e06018361e6524587b433b0c4b2a0260
17b94a
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
17b94a
Reviewed-on: https://code.engineering.redhat.com/gerrit/183147
17b94a
Tested-by: RHGS Build Bot <nigelb@redhat.com>
17b94a
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
17b94a
---
17b94a
 cli/src/cli-xml-output.c | 5 +++--
17b94a
 1 file changed, 3 insertions(+), 2 deletions(-)
17b94a
17b94a
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
17b94a
index b417bb8..006e2fb 100644
17b94a
--- a/cli/src/cli-xml-output.c
17b94a
+++ b/cli/src/cli-xml-output.c
17b94a
@@ -2548,8 +2548,9 @@ cli_xml_output_vol_info(cli_local_t *local, dict_t *dict)
17b94a
         ret = dict_get_int32(dict, key, &dist_count);
17b94a
         if (ret)
17b94a
             goto out;
17b94a
-        ret = xmlTextWriterWriteFormatElement(
17b94a
-            local->writer, (xmlChar *)"distCount", "%d", dist_count);
17b94a
+        ret = xmlTextWriterWriteFormatElement(local->writer,
17b94a
+                                              (xmlChar *)"distCount", "%d",
17b94a
+                                              (brick_count / dist_count));
17b94a
         XML_RET_CHECK_AND_GOTO(ret, out);
17b94a
 
17b94a
         snprintf(key, sizeof(key), "volume%d.stripe_count", i);
17b94a
-- 
17b94a
1.8.3.1
17b94a