Check for capacity before we check for existing record

nicktindall · nicktindall · commit 0af805059ba2 · 2025-11-06T10:51:44.000+11:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/UndesiredAllocationsTracker.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/UndesiredAllocationsTracker.java
@@ -89,7 +89,7 @@ public class UndesiredAllocationsTracker {
      */
     public void trackUndesiredAllocation(ShardRouting shardRouting) {
         assert shardRouting.unassigned() == false : "Shouldn't record unassigned shards as undesired allocations";
-        if (undesiredAllocations.containsKey(shardRouting) == false && undesiredAllocations.size() < maxUndesiredAllocationsToTrack) {
+        if (undesiredAllocations.size() < maxUndesiredAllocationsToTrack && undesiredAllocations.containsKey(shardRouting) == false) {
             undesiredAllocations.put(shardRouting, timeProvider.relativeTimeInMillis());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public class UndesiredAllocationsTracker {`
`89`	`89`	`*/`
`90`	`90`	`public void trackUndesiredAllocation(ShardRouting shardRouting) {`
`91`	`91`	`assert shardRouting.unassigned() == false : "Shouldn't record unassigned shards as undesired allocations";`
`92`		`- if (undesiredAllocations.containsKey(shardRouting) == false && undesiredAllocations.size() < maxUndesiredAllocationsToTrack) {`
	`92`	`+ if (undesiredAllocations.size() < maxUndesiredAllocationsToTrack && undesiredAllocations.containsKey(shardRouting) == false) {`
`93`	`93`	`undesiredAllocations.put(shardRouting, timeProvider.relativeTimeInMillis());`
`94`	`94`	`}`
`95`	`95`	`}`