From fd5dcc205b2d5b0db948af3a4f23148f58635cc1 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 2 May 2016 20:16:32 -0400 Subject: [PATCH] Fix intermittent failure in LeadershipTransferIntegrationTest testLeaderTransferAborted failed on jenkins b/c the leader happened to get an AppenEntriesReply from follower2 for an AppendEntries message that was sent before the test started dropping AppendEntries messages to cause leadership transfer to fail and abort. I changed the test so it drops AppendEntriesReply messages on the leader to avoid this. Change-Id: I8a04b6dd49a9a46f210658afc33ff6001143b615 Signed-off-by: Tom Pantelis --- .../cluster/raft/LeadershipTransferIntegrationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java index 28c83dbcde..acffda731f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java @@ -28,6 +28,7 @@ import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftS import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.cluster.raft.client.messages.Shutdown; import org.opendaylight.controller.cluster.raft.messages.AppendEntries; +import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import scala.concurrent.Await; import scala.concurrent.Future; @@ -196,8 +197,7 @@ public class LeadershipTransferIntegrationTest extends AbstractRaftActorIntegrat createRaftActors(); - follower1Actor.underlyingActor().startDropMessages(AppendEntries.class); - follower2Actor.underlyingActor().startDropMessages(AppendEntries.class); + leaderActor.underlyingActor().startDropMessages(AppendEntriesReply.class); sendShutDown(leaderActor); -- 2.36.6