summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2015-04-16 17:54:24 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-08-11 22:05:54 -0700
commit0dcdc8d9d797ed43d305fb3e3437c2576305ac46 (patch)
treebe9ee771788b3ad46722a519ebfa9d4b8ef16107
parent7b44b6c16fb538e5f15a255182de4dee781994a0 (diff)
glusterd: log improvement in glusterd_peer_rpc_notify
If ping time out is enabled glusterd can receive a disconnect event from a peer which has been already deleted resulting into a critical log printed. This patch ensures that critical message is logged only when its a connect event. Change-Id: I67d9aa3f60195e08af7dfc8a42683422aaf90a00 BUG: 1212437 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/10272 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index ff5707bab28..7ead1f5ab70 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -5007,12 +5007,17 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata,
peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);
if (!peerinfo) {
- /* Peerinfo should be available at this point. Not finding it
- * means that something terrible has happened
+ /* Peerinfo should be available at this point if its a connect
+ * event. Not finding it means that something terrible has
+ * happened. For non-connect event we might end up having a null
+ * peerinfo, so log at debug level.
*/
- gf_msg (THIS->name, GF_LOG_CRITICAL, ENOENT,
+ gf_msg (THIS->name, (RPC_CLNT_CONNECT == event) ?
+ GF_LOG_CRITICAL : GF_LOG_DEBUG, ENOENT,
GD_MSG_PEER_NOT_FOUND, "Could not find peer "
- "%s(%s)", peerctx->peername, uuid_utoa (peerctx->peerid));
+ "%s(%s)", peerctx->peername,
+ uuid_utoa (peerctx->peerid));
+
ret = -1;
goto out;
}