From f2bd251e19cc3b2a8efaa78c86ac053253472872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 9 Mar 2022 15:42:56 +0100 Subject: [PATCH] Fix race condition on shard region noticing shard shutdown in RememberEntitiesAndStartEntitySpec #31221 (#31224) --- .../sharding/RememberEntitiesAndStartEntitySpec.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala index eeb835524d..358a0319b9 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala @@ -91,8 +91,11 @@ class RememberEntitiesAndStartEntitySpec // trigger shard start by messaging other actor in it system.log.info("Starting shard again") - sharding ! EntityEnvelope(11, "give-me-shard") - val secondShardIncarnation = expectMsgType[ActorRef] + // race condition between this message and region getting the termination message, we may need to retry + val secondShardIncarnation = awaitAssert { + sharding ! EntityEnvelope(11, "give-me-shard") + expectMsgType[ActorRef] + } awaitAssert { secondShardIncarnation ! GetShardStats