From e8fd4f03100248175a207d5f0907a398ed992995 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Wed, 19 Oct 2016 12:53:35 +0530 Subject: [PATCH 139/141] glusterd: conditionally pass uuid for EVENT_PEER_CONNECT When a new node is probed, on the first RPC_CLNT_CONNECT peerctx->uuid is set to NULL as the same is yet to be populated. However the subesquent (dis)connect events would be carrying the valid UUIDs. Solution is not to generate EVENT_PEER_CONNECT on a peer probe trigger as CLI is already going to take care of generating the same. >Reviewed-on: http://review.gluster.org/15678 >Smoke: Gluster Build System >CentOS-regression: Gluster Build System >Reviewed-by: Samikshan Bairagya >NetBSD-regression: NetBSD Build System >Reviewed-on: http://review.gluster.org/15697 >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Smoke: Gluster Build System >Reviewed-by: Samikshan Bairagya Change-Id: I2f0de054ca09f12013a6afdd8ee158c0307796b9 BUG: 1386172 Signed-off-by: Atin Mukherjee Reviewed-on: https://code.engineering.redhat.com/gerrit/88006 --- xlators/mgmt/glusterd/src/glusterd-handler.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index d2bb20d..417c300 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -5751,9 +5751,16 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata, peerinfo->generation = uatomic_add_return (&conf->generation, 1); peerctx->peerinfo_gen = peerinfo->generation; - gf_event (EVENT_PEER_CONNECT, "host=%s;uuid=%s", - peerinfo->hostname, uuid_utoa (peerinfo->uuid)); - + /* EVENT_PEER_CONNECT will only be sent if peerctx->uuid is not + * NULL, otherwise it indicates this RPC_CLNT_CONNECT is from a + * peer probe trigger and given we already generate an event for + * peer probe this would be unnecessary. + */ + if (!gf_uuid_is_null (peerinfo->uuid)) { + gf_event (EVENT_PEER_CONNECT, "host=%s;uuid=%s", + peerinfo->hostname, + uuid_utoa (peerinfo->uuid)); + } ret = glusterd_peer_dump_version (this, rpc, peerctx); if (ret) gf_msg (this->name, GF_LOG_ERROR, 0, -- 1.7.1