From 524dd0ef4c76d6432a8ff793fdb9322b9265aade Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 12 Dec 2012 23:05:20 +0530 Subject: cluster/afr: Make afr quorum options visible in volume set help Change-Id: I705d814f63094279532806db0e1e0fc2815fc107 BUG: 884328 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/4306 Reviewed-by: Kaushal M Tested-by: Gluster Build System Reviewed-by: Anand Avati --- tests/bugs/bug-884328.t | 12 ++++++++++++ xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 tests/bugs/bug-884328.t diff --git a/tests/bugs/bug-884328.t b/tests/bugs/bug-884328.t new file mode 100644 index 000000000..ee5509bbc --- /dev/null +++ b/tests/bugs/bug-884328.t @@ -0,0 +1,12 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +cleanup; +TEST glusterd +TEST pidof glusterd + +TEST check_option_help_presence "cluster.quorum-type" +TEST check_option_help_presence "cluster.quorum-count" +cleanup; diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index ffa846dfd..4022d5918 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -127,8 +127,8 @@ static struct volopt_map_entry glusterd_volopt_map[] = { {"cluster.metadata-change-log", "cluster/replicate", NULL, NULL, NO_DOC, 0, 1}, {"cluster.data-self-heal-algorithm", "cluster/replicate", "data-self-heal-algorithm", NULL, DOC, 0, 1}, {"cluster.eager-lock", "cluster/replicate", NULL, NULL, NO_DOC, 0, 1}, - {"cluster.quorum-type", "cluster/replicate", "quorum-type", NULL, NO_DOC, 0, 1}, - {"cluster.quorum-count", "cluster/replicate", "quorum-count", NULL, NO_DOC, 0, 1}, + {"cluster.quorum-type", "cluster/replicate", "quorum-type", NULL, DOC, 0, 1}, + {"cluster.quorum-count", "cluster/replicate", "quorum-count", NULL, DOC, 0, 1}, {"cluster.choose-local", "cluster/replicate", NULL, NULL, DOC, 0, 2}, {"cluster.self-heal-readdir-size", "cluster/replicate", NULL, NULL, DOC, 0, 2}, {"cluster.readdir-failover", "cluster/replicate", NULL, NULL, DOC, 0, 2}, -- cgit