Refactor hasComputationConverged (elastic#116331)

See elastic#115511 (comment).
alexey-ivanov-es · Nov 28, 2024 · b74e50a · b74e50a
1 parent 72a395c
commit b74e50a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...n/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java b/...n/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
@@ -335,7 +335,7 @@ public DesiredBalance compute(
                 nextReportTime = currentTime + timeWarningInterval;
             }
 
-            if (hasComputationConverged(hasChanges, i)) {
+            if (hasChanges == false && hasEnoughIterations(i)) {
                 logger.debug(
                     "Desired balance computation for [{}] converged after [{}] and [{}] iterations",
                     desiredBalanceInput.index(),
@@ -415,8 +415,8 @@ public DesiredBalance compute(
     }
 
     // visible for testing
-    boolean hasComputationConverged(boolean hasRoutingChanges, int currentIteration) {
-        return hasRoutingChanges == false;
+    boolean hasEnoughIterations(int currentIteration) {
+        return true;
     }
 
     private static Map<ShardId, ShardAssignment> collectShardAssignments(RoutingNodes routingNodes) {

diff --git a/...lasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocatorTests.java b/...lasticsearch/cluster/routing/allocation/allocator/DesiredBalanceShardsAllocatorTests.java
@@ -408,8 +408,8 @@ public DesiredBalance compute(
                 }
 
                 @Override
-                boolean hasComputationConverged(boolean hasRoutingChanges, int currentIteration) {
-                    return super.hasComputationConverged(hasRoutingChanges, currentIteration) && currentIteration >= minIterations;
+                boolean hasEnoughIterations(int currentIteration) {
+                    return currentIteration >= minIterations;
                 }
             },
             reconcileAction,