From 754112b7b716c68fb6cf44941ce4f343698d533e Mon Sep 17 00:00:00 2001 From: Mohammed Junaid Date: Mon, 16 Apr 2012 12:57:57 +0530 Subject: 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 Reviewed-on: http://review.gluster.com/3153 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/protocol/client/src/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators/protocol/client') 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, -- cgit