clear -> removeTracking

nicktindall · nicktindall · commit 6330ba91bf37 · 2025-11-06T10:30:20.000+11:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconciler.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconciler.java
@@ -494,7 +494,7 @@ private void moveShards() {
 
                 if (assignment.nodeIds().contains(shardRouting.currentNodeId())) {
                     // shard is already on a desired node
-                    undesiredAllocationsTracker.clear(shardRouting);
+                    undesiredAllocationsTracker.removeTracking(shardRouting);
                     continue;
                 }
 
@@ -535,7 +535,7 @@ private void moveShards() {
                     }
                 } finally {
                     if (movedUndesiredShard) {
-                        undesiredAllocationsTracker.clear(shardRouting);
+                        undesiredAllocationsTracker.removeTracking(shardRouting);
                     } else {
                         undesiredAllocationsTracker.trackUndesiredAllocation(shardRouting);
                     }
@@ -572,7 +572,7 @@ private DesiredBalanceMetrics.AllocationStats balance() {
 
                 if (assignment.nodeIds().contains(shardRouting.currentNodeId())) {
                     // shard is already on a desired node
-                    undesiredAllocationsTracker.clear(shardRouting);
+                    undesiredAllocationsTracker.removeTracking(shardRouting);
                     continue;
                 }
 
@@ -621,7 +621,7 @@ private DesiredBalanceMetrics.AllocationStats balance() {
                     }
                 } finally {
                     if (movedUndesiredShard) {
-                        undesiredAllocationsTracker.clear(shardRouting);
+                        undesiredAllocationsTracker.removeTracking(shardRouting);
                     } else {
                         undesiredAllocationsTracker.trackUndesiredAllocation(shardRouting);
                     }
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
@@ -84,9 +84,9 @@ public void trackUndesiredAllocation(ShardRouting shardRouting) {
     }
 
     /**
-     * Clear any tracking of the provided allocation
+     * Remove any tracking of the specified allocation (a no-op if the allocation isn't being tracked)
      */
-    public void clear(ShardRouting shardRouting) {
+    public void removeTracking(ShardRouting shardRouting) {
         undesiredAllocations.remove(shardRouting);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ private void moveShards() {`
`494`	`494`
`495`	`495`	`if (assignment.nodeIds().contains(shardRouting.currentNodeId())) {`
`496`	`496`	`// shard is already on a desired node`
`497`		`- undesiredAllocationsTracker.clear(shardRouting);`
	`497`	`+ undesiredAllocationsTracker.removeTracking(shardRouting);`
`498`	`498`	`continue;`
`499`	`499`	`}`
`500`	`500`
`@@ -535,7 +535,7 @@ private void moveShards() {`
`535`	`535`	`}`
`536`	`536`	`} finally {`
`537`	`537`	`if (movedUndesiredShard) {`
`538`		`- undesiredAllocationsTracker.clear(shardRouting);`
	`538`	`+ undesiredAllocationsTracker.removeTracking(shardRouting);`
`539`	`539`	`} else {`
`540`	`540`	`undesiredAllocationsTracker.trackUndesiredAllocation(shardRouting);`
`541`	`541`	`}`
`@@ -572,7 +572,7 @@ private DesiredBalanceMetrics.AllocationStats balance() {`
`572`	`572`
`573`	`573`	`if (assignment.nodeIds().contains(shardRouting.currentNodeId())) {`
`574`	`574`	`// shard is already on a desired node`
`575`		`- undesiredAllocationsTracker.clear(shardRouting);`
	`575`	`+ undesiredAllocationsTracker.removeTracking(shardRouting);`
`576`	`576`	`continue;`
`577`	`577`	`}`
`578`	`578`
`@@ -621,7 +621,7 @@ private DesiredBalanceMetrics.AllocationStats balance() {`
`621`	`621`	`}`
`622`	`622`	`} finally {`
`623`	`623`	`if (movedUndesiredShard) {`
`624`		`- undesiredAllocationsTracker.clear(shardRouting);`
	`624`	`+ undesiredAllocationsTracker.removeTracking(shardRouting);`
`625`	`625`	`} else {`
`626`	`626`	`undesiredAllocationsTracker.trackUndesiredAllocation(shardRouting);`
`627`	`627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ public void trackUndesiredAllocation(ShardRouting shardRouting) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * Clear any tracking of the provided allocation`
	`87`	`+ * Remove any tracking of the specified allocation (a no-op if the allocation isn't being tracked)`
`88`	`88`	`*/`
`89`		`- public void clear(ShardRouting shardRouting) {`
	`89`	`+ public void removeTracking(ShardRouting shardRouting) {`
`90`	`90`	`undesiredAllocations.remove(shardRouting);`
`91`	`91`	`}`
`92`	`92`