diff options
| author | Mohammed Junaid <junaid@redhat.com> | 2012-04-16 12:57:57 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-16 11:35:49 -0700 |
| commit | 754112b7b716c68fb6cf44941ce4f343698d533e (patch) | |
| tree | 4b6b3715b766a5fb56fde8683ead841b34458598 | |
| parent | 42c06ba048d0bcb7093063bf99dfa3e520a038a5 (diff) | |
protocol/client,server: Lock self healing off by default.
Also, merged the options client.grace-timeout and server.grace-timeout
into one option "features.grace-timeout".
Change-Id: Icb9f0809f89379de673f8c9f7ca4725bc113797f
BUG: 812760
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-on: http://review.gluster.com/3153
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 3 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 9b8daa16a65..3cf5b5f1331 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -217,8 +217,8 @@ static struct volopt_map_entry glusterd_volopt_map[] = { {"server.statedump-path", "protocol/server", "statedump-path", NULL, DOC, 0}, {"features.lock-heal", "protocol/client", "lk-heal", NULL, DOC, 0}, {"features.lock-heal", "protocol/server", "lk-heal", NULL, DOC, 0}, - {"client.grace-timeout", "protocol/client", "grace-timeout", NULL, DOC, 0}, - {"server.grace-timeout", "protocol/server", "grace-timeout", NULL, DOC, 0}, + {"features.grace-timeout", "protocol/client", "grace-timeout", NULL, DOC, 0}, + {"features.grace-timeout", "protocol/server", "grace-timeout", NULL, DOC, 0}, {"feature.read-only", "features/read-only", "!read-only", "off", DOC, 0}, {NULL, } }; diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 9ce86b50900..b698f3c1866 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2314,7 +2314,7 @@ client_init_grace_timer (xlator_t *this, dict_t *options, GF_VALIDATE_OR_GOTO (this->name, options, out); GF_VALIDATE_OR_GOTO (this->name, conf, out); - conf->lk_heal = _gf_true; + conf->lk_heal = _gf_false; ret = dict_get_str (options, "lk-heal", &lk_heal); if (!ret) @@ -2709,6 +2709,7 @@ struct volume_options options[] = { }, { .key = {"lk-heal"}, .type = GF_OPTION_TYPE_BOOL, + .default_value = "off", }, { .key = {"grace-timeout"}, .type = GF_OPTION_TYPE_INT, diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index aa21df5e63a..a99ba817e5e 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -797,7 +797,7 @@ server_init_grace_timer (xlator_t *this, dict_t *options, GF_VALIDATE_OR_GOTO (this->name, options, out); GF_VALIDATE_OR_GOTO (this->name, conf, out); - conf->lk_heal = _gf_true; + conf->lk_heal = _gf_false; ret = dict_get_str (options, "lk-heal", &lk_heal); if (!ret) @@ -1196,6 +1196,7 @@ struct volume_options options[] = { }, { .key = {"lk-heal"}, .type = GF_OPTION_TYPE_BOOL, + .default_value = "off", }, {.key = {"grace-timeout"}, .type = GF_OPTION_TYPE_INT, |