diff options
| author | Kaushal M <kaushal@redhat.com> | 2012-08-09 19:29:33 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2012-08-17 01:12:36 -0700 |
| commit | 6930c6950f7b7a8186ebfcdf9ebcad11e90740c0 (patch) | |
| tree | 1dc2f56fad7ede0eb9d6c50f499f7ac82023817b /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | acf73966abd3ad3fe341a933f76c821e19fd7b95 (diff) | |
rpc: Reduce frame-timeout for glusterd connections
Reduce frame-timeout for glusterd connections from 30mins to 10 mins. 30mins is
too long when compared to cli timeout of 2mins. Changing to 10mins reduces the
disparity between cli and glusterd.
Also, fix glusterfs_submit_reply() so that a reply is sent even if serialize
failed.
Change-Id: Id5f68f2ff28ea7453d9a62429fe12aa0c0a66952
BUG: 843003
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3803
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 0267129b010..e10de75c63c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1121,7 +1121,14 @@ glusterd_brick_connect (glusterd_volinfo_t *volinfo, glusterd_set_brick_socket_filepath (volinfo, brickinfo, socketpath, sizeof (socketpath)); - ret = rpc_clnt_transport_unix_options_build (&options, socketpath); + + /* Setting frame-timeout to 10mins (600seconds). + * Unix domain sockets ensures that the connection is reliable. + * The default timeout of 30mins used for unreliable network + * connections is too long for unix domain socket connections. + */ + ret = rpc_clnt_transport_unix_options_build (&options, + socketpath, 600); if (ret) goto out; ret = glusterd_rpc_create (&rpc, options, @@ -2812,8 +2819,13 @@ glusterd_nodesvc_connect (char *server, char *socketpath) { rpc = glusterd_nodesvc_get_rpc (server); if (rpc == NULL) { + /* Setting frame-timeout to 10mins (600seconds). + * Unix domain sockets ensures that the connection is reliable. + * The default timeout of 30mins used for unreliable network + * connections is too long for unix domain socket connections. + */ ret = rpc_clnt_transport_unix_options_build (&options, - socketpath); + socketpath, 600); if (ret) goto out; ret = glusterd_rpc_create (&rpc, options, |