raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Hardening of JoinConfigCompatCheckerSpec, #30843 (#30955)

Browse source 
* status is not always updated for a shutdown cluster node, see issue #17479
* look from the other members instead
This commit is contained in:
Patrik Nordwall 2021-12-06 09:20:37 +01:00 • committed by GitHub
parent 31c020a8c1
commit 06e69e66ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala
View file

@ -10,7 +10,6 @@ import scala.util.Random
import com.typesafe.config.{ Config, ConfigFactory } import com.typesafe.config.{ Config, ConfigFactory }
import akka.actor.ActorSystem import akka.actor.ActorSystem
import akka.cluster.MemberStatus.Removed
import akka.testkit.{ AkkaSpec, TestKitBase } import akka.testkit.{ AkkaSpec, TestKitBase }
/** /**
@ -116,14 +115,22 @@ trait ClusterTestKit extends TestKitBase {
val port = cluster.selfAddress.port.get val port = cluster.selfAddress.port.get
// remove old before starting the new one // remove old before starting the new one
cluster.leave(cluster.readView.selfAddress) cluster.leave(cluster.selfAddress)
awaitCond( awaitCond(cluster.isTerminated, message = s"awaiting node [${cluster.selfAddress}] to leave and be terminated")
cluster.readView.status == Removed,
message = awaitAssert {
s"awaiting node [${cluster.readView.selfAddress}] to be 'Removed'. Current status: [${cluster.readView.status}]") actorSystems.foreach { sys =>
if (sys != actorSystem && Cluster(sys).selfMember.status == MemberStatus.Up) {
// check that it's removed from members
if (Cluster(sys).state.members.exists(_.uniqueAddress == cluster.selfUniqueAddress))
throw new AssertionError(
s"awaiting node [${cluster.selfAddress}] to be removed, " +
s"still member in [${Cluster(sys).selfAddress}]: ${Cluster(sys).state}")
}
}
}
shutdown(actorSystem) shutdown(actorSystem)
awaitCond(cluster.isTerminated)
// remove from internal list // remove from internal list
actorSystems = actorSystems.filterNot(_ == actorSystem) actorSystems = actorSystems.filterNot(_ == actorSystem)
@ -140,12 +147,12 @@ trait ClusterTestKit extends TestKitBase {
/** /**
* Returns true if the cluster instance for the provided [[ActorSystem]] is [[MemberStatus.Up]]. * Returns true if the cluster instance for the provided [[ActorSystem]] is [[MemberStatus.Up]].
*/ */
def isMemberUp(system: ActorSystem): Boolean = Cluster(system).readView.status == MemberStatus.Up def isMemberUp(system: ActorSystem): Boolean = Cluster(system).selfMember.status == MemberStatus.Up
/** /**
* Returns true if the cluster instance for the provided [[ActorSystem]] has be shutdown. * Returns true if the cluster instance for the provided [[ActorSystem]] has be shutdown.
*/ */
def isTerminated(system: ActorSystem): Boolean = Cluster(system).readView.isTerminated def isTerminated(system: ActorSystem): Boolean = Cluster(system).isTerminated
} }
} }