summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2015-04-10 15:17:05 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-04-14 05:20:28 +0000
commitc528589a585c23b4288784247310b8763612a822 (patch)
tree3b451430e4dbf4209922dcccc85dd9f70c8a5662
parent6e8298654a7d0de29192b88d769132cfc51c9ac7 (diff)
glusterd: Store ping-timeout in glusterd conf in memory
As of now glusterd_conf_t's ping-timeout was of no use and hence statedump was not reflecting correct ping-timeout value configured in glusterd.vol Change-Id: I76ba7b721264565751538c7fcdcb801a28317581 BUG: 1210627 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/10191 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 6ffde511af4..361cc007327 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -1588,6 +1588,11 @@ init (xlator_t *this)
}
}
+ /* Store ping-timeout in conf */
+ ret = dict_get_int32 (this->options, "ping-timeout",
+ &conf->ping_timeout);
+ /* Not failing here since ping-timeout can be optional as well */
+
this->private = conf;
glusterd_mgmt_v3_lock_init ();
glusterd_txn_opinfo_dict_init ();