Avoid unnecessary shard updates while shutting down (#1342)

* Avoid unnecessary shard updates while shutting down * Avoid re-creating the same message for each shard
apache · Jun 4, 2024 · 163f6e8 · 163f6e8
1 parent d0a7293
commit 163f6e8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
@@ -1003,8 +1003,9 @@ private[pekko] class ShardRegion(
       shardsByRef = shardsByRef - ref
       shards = shards - shardId
       startingShards -= shardId
-      if (settings.passivationStrategy != ClusterShardingSettings.NoPassivationStrategy) {
-        shards.values.foreach(_ ! ShardsUpdated(shards.size))
+      if (settings.passivationStrategy != ClusterShardingSettings.NoPassivationStrategy && !gracefulShutdownInProgress) {
+        val update = ShardsUpdated(shards.size)
+        shards.values.foreach(_ ! update)
       }
       if (handingOff.contains(ref)) {
         handingOff = handingOff - ref
@@ -1348,7 +1349,8 @@ private[pekko] class ShardRegion(
             shards = shards.updated(id, shard)
             startingShards += id
             if (settings.passivationStrategy != ClusterShardingSettings.NoPassivationStrategy) {
-              shards.values.foreach(_ ! ShardsUpdated(shards.size))
+              val update = ShardsUpdated(shards.size)
+              shards.values.foreach(_ ! update)
             }
             None
           case Some(_) =>