summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorVarun Shastry <vshastry@redhat.com>2013-12-09 17:51:40 +0530
committerVijay Bellur <vbellur@redhat.com>2014-01-12 23:46:15 -0800
commitf7fcbc0ffe0e56f81f73f99e0d4825cd95ca0014 (patch)
treeaddd3177f3493e35a7ec47c553fe3c3c9f38772c /xlators/protocol
parent6992e4e37df9b12aa3582bb71341e9591d9f6e20 (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>
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client.c10
-rw-r--r--xlators/protocol/server/src/server.c10
2 files changed, 14 insertions, 6 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index ac3fcb1..d8c5f42 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2841,13 +2841,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 a797a0d..56b83cb 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)
@@ -1101,13 +1101,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."
},