|
 |
50dc83 |
From c63346dab3e5da0605bf4ddaa314253f42892c9d Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
Date: Wed, 8 May 2019 12:13:59 +0530
|
|
|
50dc83 |
Subject: [PATCH 136/141] glusterd: fix inconsistent global option output in
|
|
|
50dc83 |
volume get
|
|
|
50dc83 |
|
|
|
50dc83 |
volume get all all | grep <key> & volume get <volname> all | grep <key>
|
|
|
50dc83 |
dumps two different output value for cluster.brick-multiplex and
|
|
|
50dc83 |
cluster.server-quorum-ratio
|
|
|
50dc83 |
|
|
|
50dc83 |
>upstream patch : https://review.gluster.org/#/c/glusterfs/+/22680/
|
|
|
50dc83 |
|
|
|
50dc83 |
>Fixes: bz#1707700
|
|
|
50dc83 |
>Change-Id: Id131734e0502aa514b84768cf67fce3c22364eae
|
|
|
50dc83 |
>Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
|
|
|
50dc83 |
BUG: 1706776
|
|
|
50dc83 |
Change-Id: Id131734e0502aa514b84768cf67fce3c22364eae
|
|
|
50dc83 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/169948
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
xlators/mgmt/glusterd/src/glusterd-volume-set.c | 4 ++--
|
|
|
50dc83 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
50dc83 |
index e52de20..4b32fb6 100644
|
|
|
50dc83 |
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
50dc83 |
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
50dc83 |
@@ -2906,7 +2906,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
|
|
|
50dc83 |
.op_version = 1},
|
|
|
50dc83 |
{.key = GLUSTERD_QUORUM_RATIO_KEY,
|
|
|
50dc83 |
.voltype = "mgmt/glusterd",
|
|
|
50dc83 |
- .value = "0",
|
|
|
50dc83 |
+ .value = "51",
|
|
|
50dc83 |
.op_version = 1},
|
|
|
50dc83 |
/* changelog translator - global tunables */
|
|
|
50dc83 |
{.key = "changelog.changelog",
|
|
|
50dc83 |
@@ -3547,7 +3547,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
|
|
|
50dc83 |
/* Brick multiplexing options */
|
|
|
50dc83 |
{.key = GLUSTERD_BRICK_MULTIPLEX_KEY,
|
|
|
50dc83 |
.voltype = "mgmt/glusterd",
|
|
|
50dc83 |
- .value = "off",
|
|
|
50dc83 |
+ .value = "disable",
|
|
|
50dc83 |
.op_version = GD_OP_VERSION_3_10_0,
|
|
|
50dc83 |
.validate_fn = validate_boolean,
|
|
|
50dc83 |
.type = GLOBAL_DOC,
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|