summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/rpc-clnt-ping.c5
-rw-r--r--rpc/rpc-lib/src/rpc-clnt-ping.h1
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c8
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);