summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-11-16 01:21:54 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-11-15 23:46:07 -0800
commit66c768a4845482c42a77e458ecbc73488998fb13 (patch)
tree6dcd3e5ad73233c03dd5beb64b97c2769c7dfb1a
parenteb13791c229b011b41e63099ce097a4271ae0451 (diff)
protocol/client: fix ping timeout checks in reconfigure()
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2104 ([3.1.1qa5]: network.ping-timeout set failed) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2104
-rw-r--r--xlators/protocol/client/src/client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 53c356cdec6..6a401217305 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -1908,7 +1908,7 @@ reconfigure (xlator_t *this, dict_t *options)
&ping_timeout);
if (timeout_ret == 0) {
- if (frame_timeout < 5 ) {
+ if (ping_timeout < 5 ) {
gf_log (this->name, GF_LOG_WARNING, "Reconfiguration"
"'option ping-timeout %d failed , Min value"
" can be 5, Defaulting to old value (%d)"
@@ -1917,11 +1917,11 @@ reconfigure (xlator_t *this, dict_t *options)
goto out;
}
- if (frame_timeout > 1013 ) {
+ if (ping_timeout > 1013 ) {
gf_log (this->name, GF_LOG_WARNING, "Reconfiguration"
- "'option frame-timeout %d failed , Max value"
+ "'option ping-timeout %d failed , Max value"
"can be 1013, Defaulting to old value (%d)"
- , frame_timeout, conf->opt.ping_timeout);
+ , ping_timeout, conf->opt.ping_timeout);
ret = -1;
goto out;
}