summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarun Shastry <vshastry@redhat.com>2013-12-09 17:51:40 +0530
committerVijay Bellur <vbellur@redhat.com>2014-01-28 22:33:30 -0800
commit9f8ca919eb8472fec033a70f06fd18ab9fad1fd5 (patch)
tree609673aeeaec70afa373e73fbb6c02b698c483b1
parent7a871c27f7dedfbd228aac4c2eefd6b829aa619c (diff)
mgmt/glusterd: Improve the description in volume set help output
Change-Id: I785648970f53033a69922c23110b5eea9e47feb3 BUG: 1046030 Signed-off-by: Varun Shastry <vshastry@redhat.com> Reviewed-on: http://review.gluster.org/6573 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/6837
-rw-r--r--xlators/cluster/dht/src/dht-shared.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c9
-rw-r--r--xlators/protocol/client/src/client.c10
-rw-r--r--xlators/protocol/server/src/server.c10
4 files changed, 23 insertions, 9 deletions
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index 674297c..324b306 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -690,7 +690,8 @@ struct volume_options options[] = {
.type = GF_OPTION_TYPE_INT,
.min = 1,
.validate = GF_OPT_VALIDATE_MIN,
- .description = "Specifies the directory layout spread."
+ .description = "Specifies the directory layout spread. Takes number "
+ "of subvolumes as default value."
},
{ .key = {"decommissioned-bricks"},
.type = GF_OPTION_TYPE_ANY,
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 5883386..d59aaa4 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -1516,8 +1516,13 @@ struct volume_options options[] = {
{ .key = {"server-quorum-type"},
.type = GF_OPTION_TYPE_STR,
.value = { "none", "server"},
- .description = "If set to server, enables the specified "
- "volume to participate in quorum."
+ .description = "This feature is on the server-side i.e. in glusterd."
+ " Whenever the glusterd on a machine observes that "
+ "the quorum is not met, it brings down the bricks to "
+ "prevent data split-brains. When the network "
+ "connections are brought back up and the quorum is "
+ "restored the bricks in the volume are brought back "
+ "up."
},
{ .key = {"server-quorum-ratio"},
.type = GF_OPTION_TYPE_PERCENT,
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index adb5801..b0a71d3 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2842,13 +2842,19 @@ struct volume_options options[] = {
{ .key = {"lk-heal"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "off",
- .description = "Enables or disables the lock heal."
+ .description = "When the connection to client is lost, server "
+ "cleans up all the locks held by the client. After "
+ "the connection is restored, the client reacquires "
+ "(heals) the fcntl locks released by the server."
},
{ .key = {"grace-timeout"},
.type = GF_OPTION_TYPE_INT,
.min = 10,
.max = 1800,
- .description = "Sets the grace-timeout value. Valid range 10-1800."
+ .default_value = "10",
+ .description = "Specifies the duration for the lock state to be "
+ "maintained on the client after a network "
+ "disconnection. Range 10-1800 seconds."
},
{.key = {"tcp-window-size"},
.type = GF_OPTION_TYPE_SIZET,
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 702deaa..1e23630 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -770,7 +770,7 @@ client_destroy_cbk (xlator_t *this, client_t *client)
server_ctx_t *ctx = NULL;
client_ctx_del (client, this, &tmp);
-
+
ctx = tmp;
if (ctx == NULL)
@@ -1085,13 +1085,15 @@ struct volume_options options[] = {
{ .key = {"auth.addr.*.allow"},
.type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST,
.description = "Allow a comma separated list of addresses and/or "
- "hostnames to connect to the server. By default, all"
- " connections are allowed."
+ "hostnames to connect to the server. Option "
+ "auth.reject overrides this option. By default, all "
+ "connections are allowed."
},
{ .key = {"auth.addr.*.reject"},
.type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST,
.description = "Reject a comma separated list of addresses and/or "
- "hostnames to connect to the server. By default, all"
+ "hostnames to connect to the server. This option "
+ "overrides the auth.allow option. By default, all"
" connections are allowed."
},