diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2014-04-07 10:57:45 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-04-29 14:23:51 -0700 |
| commit | c61bc1f9e5874cb8380ec6398680fc71aea233b4 (patch) | |
| tree | c02fee67ebcc7c43a6338d34c5700916e672c110 /rpc/xdr/src | |
| parent | 91ab65f812ec3b674f53230eacbd0d71964d3d01 (diff) | |
glusterd: Ping timer implmentation
This patch refactors the existing client ping timer implementation, and makes
use of the common code for implementing both client ping timer and the
glusterd ping timer.
A new gluster rpc program for ping is introduced. The ping timer is only
started for peers that have this new program. The deafult glusterd ping
timeout is 30 seconds. It is configurable by setting the option
'ping-timeout' in glusterd.vol .
Also, this patch introduces changes in the glusterd-handshake path. The client
programs for a peer are now set in the callback of dump_versions, for both
the older handshake and the newer op-version handshake. This is the only place
in the handshake process where we know what programs a peer supports.
Change-Id: I035815ac13449ca47080ecc3253c0a9afbe9016a
BUG: 1038261
Signed-off-by: Vijaikumar M <vmallika@redhat.com>
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/5202
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc/xdr/src')
| -rw-r--r-- | rpc/xdr/src/glusterfs3-xdr.x | 6 | ||||
| -rw-r--r-- | rpc/xdr/src/rpc-common-xdr.x | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x index feef7e2649e..72f528e0a1c 100644 --- a/rpc/xdr/src/glusterfs3-xdr.x +++ b/rpc/xdr/src/glusterfs3-xdr.x @@ -692,12 +692,6 @@ struct gfs3_release_req { opaque xdata<>; /* Extra data */ } ; -struct gf_common_rsp { - int op_ret; - int op_errno; - opaque xdata<>; /* Extra data */ -} ; - struct gfs3_dirlist { u_quad_t d_ino; u_quad_t d_off; diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x index ee66500e032..e94077543b7 100644 --- a/rpc/xdr/src/rpc-common-xdr.x +++ b/rpc/xdr/src/rpc-common-xdr.x @@ -37,3 +37,10 @@ struct gf_dump_rsp { int op_errno; struct gf_prog_detail *prog; }; + + +struct gf_common_rsp { + int op_ret; + int op_errno; + opaque xdata<>; /* Extra data */ +} ; |