summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-03-01 17:31:11 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-03-02 08:56:21 -0800
commit14609729da9ed8f76be6ff0ce5d6a6b278af6e8d (patch)
tree5b99a26cd1ded7e0b054dfa875f558c796e67600
parentbc07cb8cc45e79c54e4d411b2e2dd5b2f68bae17 (diff)
mgmt/glusterd: Show features.shard option in volume-set-help output
Change-Id: If9004c4374b92d058cf56add50a91ecad43a2840 BUG: 1261773 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/13565 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--tests/bugs/shard/bug-1261773.t14
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c3
2 files changed, 16 insertions, 1 deletions
diff --git a/tests/bugs/shard/bug-1261773.t b/tests/bugs/shard/bug-1261773.t
new file mode 100644
index 00000000000..46d5a8b91c9
--- /dev/null
+++ b/tests/bugs/shard/bug-1261773.t
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup
+
+TEST glusterd
+TEST pidof glusterd
+
+TEST check_option_help_presence "features.shard"
+TEST check_option_help_presence "features.shard-block-size"
+
+cleanup
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 96026a98d95..32d95f01e12 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -2639,7 +2639,8 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.value = "off",
.option = "!shard",
.op_version = GD_OP_VERSION_3_7_0,
- .flags = OPT_FLAG_CLIENT_OPT
+ .description = "enable/disable sharding translator on the volume.",
+ .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT
},
{ .key = "features.shard-block-size",
.voltype = "features/shard",