diff options
| author | Kaushal M <kaushal@redhat.com> | 2012-08-17 13:12:33 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-08-17 13:46:19 +0530 |
| commit | 9c0cbe6955f702b1ca27e0f48e309382f5d59186 (patch) | |
| tree | fcb2980cca180b2ce6ae335247bddd3a323b2b97 /glusterfsd | |
| parent | 804f8fc459db25f395acf7741e20cda8b35a9353 (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.
BUG: 843003
Change-Id: Ie8d5ec16fbbb54318a5935a47065e66fd3338b87
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3812
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index d8582aa7013..08aad9dc6e7 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -141,11 +141,10 @@ glusterfs_submit_reply (rpcsvc_request_t *req, void *arg, iob = glusterfs_serialize_reply (req, arg, &rsp, xdrproc); if (!iob) { gf_log_callingfn (THIS->name, GF_LOG_ERROR, "Failed to serialize reply"); - goto out; + } else { + iobref_add (iobref, iob); } - iobref_add (iobref, iob); - ret = rpcsvc_submit_generic (req, &rsp, 1, payload, payloadcount, iobref); |