diff options
| author | Vijaikumar M <vmallika@redhat.com> | 2014-05-13 17:36:01 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-05-19 19:03:55 -0700 |
| commit | c13c1fd5a487eeca269e8b62114f607487ee30f6 (patch) | |
| tree | a9ca13e83a6dbb99def605e172542974adb932c3 /rpc | |
| parent | 1dd80a2e7762bc72d11a432a1ebd16be181dcb86 (diff) | |
glusterd: Disable ping-timer between glusterd and brick process
When there are too many IO happening, brick process epoll thread
will be busy and fails to respond to the glusterd pick packet within
30sec.
Also epoll thread can be blocked by a big-lock.
Solution is to disable ping-timer by default and only enable where ever
required
Later when the epoll thread model changed and made lighter,
we need to revert back this change. http://review.gluster.com/3842 is
one such approach.
Change-Id: I7f80ad3eb00f7d9c4d4527305932f7cf4920e73f
BUG: 1097224
Signed-off-by: Vijaikumar M <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/7753
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt-ping.c | 5 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt-ping.h | 1 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.c b/rpc/rpc-lib/src/rpc-clnt-ping.c index 845ce235a2b..26831ba11f3 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.c +++ b/rpc/rpc-lib/src/rpc-clnt-ping.c @@ -147,7 +147,7 @@ rpc_clnt_ping_cbk (struct rpc_req *req, struct iovec *iov, int count, } else { /* timer expired and transport bailed out */ gf_log (this->name, GF_LOG_WARNING, - "timer must have expired"); + "socket disconnected"); } conn->ping_started = 0; @@ -226,7 +226,8 @@ rpc_clnt_start_ping (void *rpc_ptr) conn = &rpc->conn; if (conn->ping_timeout == 0) { - gf_log (THIS->name, GF_LOG_INFO, "ping timeout is 0, returning"); + gf_log (THIS->name, GF_LOG_DEBUG, "ping timeout is 0," + " returning"); return; } diff --git a/rpc/rpc-lib/src/rpc-clnt-ping.h b/rpc/rpc-lib/src/rpc-clnt-ping.h index e7fbf3ced9d..4edc416cee9 100644 --- a/rpc/rpc-lib/src/rpc-clnt-ping.h +++ b/rpc/rpc-lib/src/rpc-clnt-ping.h @@ -14,5 +14,6 @@ #include "config.h" #endif +#define RPC_DEFAULT_PING_TIMEOUT 30 void rpc_clnt_start_ping (void *rpc_ptr); diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 475afb49739..44324a80431 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -984,9 +984,11 @@ rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx, gf_log (name, GF_LOG_DEBUG, "setting ping-timeout to %d", conn->ping_timeout); } else { - gf_log (name, GF_LOG_INFO, - "defaulting ping-timeout to 30secs"); - conn->ping_timeout = 30; + /*TODO: Once the epoll thread model is fixed, + change the default ping-timeout to 30sec */ + gf_log (name, GF_LOG_DEBUG, + "disable ping-timeout"); + conn->ping_timeout = 0; } trans = rpc_transport_load (ctx, options, name); |