From 7239fd839727645b41a2893c62d25169078903a2 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 24 Jun 2015 14:31:25 +0200 Subject: [PATCH] =clu #16890 Add missing barrier in LeaderDowningNodeThatIsUnreachableSpec --- .../scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala | 1 + .../akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala | 2 ++ 2 files changed, 3 insertions(+) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala index 212f60db2f..685fd7ffc0 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala @@ -49,6 +49,7 @@ abstract class LeaderDowningAllOtherNodesSpec "remove all shutdown nodes" taggedAs LongRunningTest in { val others = roles.drop(1) val shutdownAddresses = others.map(address).toSet + enterBarrier("before-all-other-shutdown") runOn(first) { for (node ← others) testConductor.exit(node, 0).await diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala index 68a2c8f2b7..4237d7f868 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala @@ -50,6 +50,8 @@ abstract class LeaderDowningNodeThatIsUnreachableSpec(multiNodeConfig: LeaderDow awaitClusterUp(first, second, third, fourth) val fourthAddress = address(fourth) + + enterBarrier("before-exit-fourth-node") runOn(first) { // kill 'fourth' node testConductor.exit(fourth, 0).await