From 8197b46b37cc573c67ba0c3a44539064345eb926 Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Tue, 1 Mar 2016 17:31:11 +0530 Subject: mgmt/glusterd: Show features.shard option in volume-set-help output Backport of: http://review.gluster.org/#/c/13565/ Change-Id: Ief6f62c65dd8cc736edc785ac06af6ee7309862c BUG: 1313339 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/13566 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Pranith Kumar Karampuri --- tests/bugs/shard/bug-1261773.t | 14 ++++++++++++++ xlators/mgmt/glusterd/src/glusterd-volume-set.c | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/bugs/shard/bug-1261773.t 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 fcc303603bf..b8821680d4c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -2608,7 +2608,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", -- cgit