diff options
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 9 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 10 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 10 |
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 674297c71..324b30626 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 58833869a..d59aaa44a 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 ac3fcb117..d8c5f4262 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 a797a0d6c..56b83cb9a 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." }, |