summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-utils.c
diff options
context:
space:
mode:
authorSamikshan Bairagya <samikshan@gmail.com>2016-10-13 17:13:54 +0530
committerAtin Mukherjee <amukherj@redhat.com>2016-10-21 10:41:08 -0700
commit3ab27b0420045f88e10e0506d08cf21308cfce70 (patch)
treee27320d2bb3ca9df6c9bb935dd2bbc353efd7328 /xlators/mgmt/glusterd/src/glusterd-utils.c
parent1e6db41c3a1969474ad6a6831815b0c0de378877 (diff)
cli, glusterd: Address issues in get-state cli output
This fixes the following data points: 1. Volume type 2. Peer state 3. List of other hostnames for a peer 4. Data unit information for rebalance The following data points are removed: 1. Mount options and filesystem types for bricks 2. global-option-version from list of global options The following data points are added: 1. Replica Count 2. Tier type for bricks belonging to hot/cold tier > Reviewed-on: http://review.gluster.org/15662 > Reviewed-by: mohammed rafi kc <rkavunga@redhat.com> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > Smoke: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Atin Mukherjee <amukherj@redhat.com> (cherry picked from commit daea58a51b70f80ab04f115e49f8bf8790b6046a) Change-Id: I5011250e863fdc4929b203cdb345d79b2f16c6a5 BUG: 1387502 Signed-off-by: Samikshan Bairagya <samikshan@gmail.com> Reviewed-on: http://review.gluster.org/15696 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 7fdb45a043b..3366ce41595 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -11244,8 +11244,8 @@ glusterd_volume_get_type_str (glusterd_volinfo_t *volinfo, char **voltype_str)
GF_VALIDATE_OR_GOTO (THIS->name, volinfo, out);
- type = get_vol_type (volinfo->type, volinfo->brick_count,
- volinfo->dist_leaf_count);
+ type = get_vol_type (volinfo->type, volinfo->dist_leaf_count,
+ volinfo->brick_count);
*voltype_str = vol_type_str[type];