From 03f387f3997e608a3d1fc41b31334954b2ce38f2 Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Thu, 26 Jan 2017 18:36:33 +0100 Subject: [PATCH] BUG-6937: Add ReachableMember case to Gossiper In case we detect a member down event we remove that member's address from the whitelist, leading to further gossips being ignored. Subscribe to ReachableMember event to receive notifications when the cluster heals, so we propagate re-add the member back to the whitelist. Change-Id: Id6b366edfa2be89e1a15225d2cad786bbf552129 Signed-off-by: Tomas Cere Signed-off-by: Robert Varga (cherry picked from commit b78ee4d6b08e2cc0cf5edd01af0e54c3bf619ab5) --- .../remote/rpc/registry/gossip/Gossiper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java index f597c316e5..a50a2723cd 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java @@ -104,6 +104,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { cluster.subscribe(getSelf(), ClusterEvent.initialStateAsEvents(), ClusterEvent.MemberEvent.class, + ClusterEvent.ReachableMember.class, ClusterEvent.UnreachableMember.class); } @@ -144,7 +145,10 @@ public class Gossiper extends AbstractUntypedActorWithMetering { // comparing the GossipStatus message with its local versions. receiveGossip((GossipEnvelope) message); } else if (message instanceof ClusterEvent.MemberUp) { - receiveMemberUp(((ClusterEvent.MemberUp) message).member()); + receiveMemberUpOrReachable(((ClusterEvent.MemberUp) message).member()); + + } else if (message instanceof ClusterEvent.ReachableMember) { + receiveMemberUpOrReachable(((ClusterEvent.ReachableMember) message).member()); } else if (message instanceof ClusterEvent.MemberRemoved) { receiveMemberRemoveOrUnreachable(((ClusterEvent.MemberRemoved) message).member()); @@ -179,10 +183,11 @@ public class Gossiper extends AbstractUntypedActorWithMetering { * Add member to the local copy of member list if it doesnt already * @param member */ - void receiveMemberUp(Member member) { + void receiveMemberUpOrReachable(final Member member) { if (selfAddress.equals(member.address())) { - return; //ignore up notification for self + //ignore up notification for self + return; } if (!clusterMembers.contains(member.address())) { -- 2.36.6