summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorVijaikumar M <vmallika@redhat.com>2014-06-05 13:26:22 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2014-06-06 20:52:09 -0700
commitd64d0129ee8e0c32f027cf9df17e8debfaf73ab2 (patch)
tree33ff0fcbdb32ae6a585ed44085d4a506597f54a5 /xlators/mgmt/glusterd
parentf2b42887c1f9780980abe491ed34a13a7b3d4583 (diff)
gluster: Set ping-timeout between glusterd peer rpc connection
With Patch# http://review.gluster.org/#/c/7753/, ping-timeout got disabled between glusterd peer rpc connection. This would create regression for bug#1034479 Change-Id: Ib7a756fce7d349ce5b7b4c6a287f2d040c83fc76 BUG: 1097224 Signed-off-by: Vijaikumar M <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/7989 Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index e6b744af536..0770f26a17c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -3081,6 +3081,11 @@ glusterd_friend_rpc_create (xlator_t *this, glusterd_peerinfo_t *peerinfo,
ret = dict_set(options,
"transport.socket.source-addr",data);
}
+ data = dict_get(this->options,"ping-timeout");
+ if (data) {
+ ret = dict_set(options,
+ "ping-timeout",data);
+ }
}
ret = glusterd_rpc_create (&peerinfo->rpc, options,