Update logging (#88247)

elastic · Jul 5, 2022 · f2796ed · f2796ed
1 parent f2847f9
commit f2796ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...r/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/...r/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
@@ -45,7 +45,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.elasticsearch.test.ESIntegTestCase.Scope;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.MockLogAppender;
 
 import java.nio.file.Path;
@@ -220,7 +219,7 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
             .put(ThrottlingAllocationDecider.CLUSTER_ROUTING_ALLOCATION_NODE_CONCURRENT_OUTGOING_RECOVERIES_SETTING.getKey(), 1)
             .build();
         logger.info("--> starting 4 nodes");
-        String node_1 = internalCluster().startNode(commonSettings);
+        String node1 = internalCluster().startNode(commonSettings);
         internalCluster().startNode(commonSettings);
         internalCluster().startNode(commonSettings);
         internalCluster().startNode(commonSettings);
@@ -248,7 +247,7 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
         ensureGreen(TimeValue.timeValueMinutes(1));
 
         logger.info("--> stopping node1");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node_1));
+        internalCluster().stopNode(node1);
 
         // This might run slowly on older hardware
         ensureGreen(TimeValue.timeValueMinutes(2));

diff --git a/...n/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java b/...n/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
@@ -210,9 +210,6 @@ public DesiredBalance compute(
             // TODO what if we never converge?
             // TODO maybe expose interim desired balances computed here
 
-            if (i % 100 == 0) {
-                logger.trace("desired balance computation is still not completed after {} iterations", i);
-            }
             if (hasChanges == false) {
                 logger.trace("desired balance computation converged after {} iterations", i);
                 break;
@@ -223,6 +220,9 @@ public DesiredBalance compute(
                 logger.trace("newer cluster state received, publishing incomplete desired balance and restarting computation");
                 break;
             }
+            if (i > 0 && i % 100 == 0) {
+                logger.warn("desired balance computation is still not converged after {} iterations", i);
+            }
         }
 
         final var assignments = new HashMap<ShardId, ShardAssignment>();