summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorMohammed Junaid <junaid@redhat.com>2012-03-19 19:56:21 +0530
committerVijay Bellur <vijay@gluster.com>2012-03-19 08:11:43 -0700
commit83277598bda524f44b76feed6adc7b19fc49d49a (patch)
tree86f436c187c910ee6a7899e8bdc3a2f0ffe54cef /xlators/mgmt
parentf076c23f381d9013d4fa2145c329033a51194597 (diff)
protocol/server: Handle server send reply failure gracefully.
Server send reply failure should not call server connection cleanup because if a reconnection happens with in the grace-timeout the connection object is reused. We must cleanup only on grace-timeout. Change-Id: I7d171a863382646ff392031c2b845fe4f0d3d5dc BUG: 803365 Signed-off-by: Mohammed Junaid <junaid@redhat.com> Reviewed-on: http://review.gluster.com/2947 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 2004a0834e2..8e35ad08ac4 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -210,7 +210,8 @@ static struct volopt_map_entry glusterd_volopt_map[] = {
{VKEY_FEATURES_LIMIT_USAGE, "features/quota", "limit-set", NULL, NO_DOC, 0},
{"features.quota-timeout", "features/quota", "timeout", "0", DOC, 0},
{"server.statedump-path", "protocol/server", "statedump-path", NULL, NO_DOC, 0},
- {"client.lk-heal", "protocol/client", "lk-heal", 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},
{"feature.read-only", "features/read-only", "!read-only", "off", DOC, 0},