change to non-negative random longs in testing; add a few checks in InternalClusterInfoServiceSchedulingTests to verify the new method is called

DiannaHohensee · DiannaHohensee · commit 1ff495e2b6da · 2025-12-22T11:05:27.000-08:00
diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java
@@ -74,7 +74,7 @@ private static Map<ShardId, ShardAndIndexHeapUsage> randomShardHeapUsages() {
         int numEntries = randomIntBetween(0, 128);
         Map<ShardId, ShardAndIndexHeapUsage> shardHeapUsageBuilder = new HashMap<>(numEntries);
         for (int i = 0; i < numEntries; i++) {
-            shardHeapUsageBuilder.put(randomShardId(), new ShardAndIndexHeapUsage(randomLong(), randomLong()));
+            shardHeapUsageBuilder.put(randomShardId(), new ShardAndIndexHeapUsage(randomNonNegativeLong(), randomNonNegativeLong()));
         }
         return shardHeapUsageBuilder;
     }
diff --git a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java b/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java
@@ -154,6 +154,7 @@ public void reroute(String reason, Priority priority, ActionListener<Void> liste
             // should have run two client requests: nodes stats request and indices stats request
             assertThat(client.requestCount, equalTo(initialRequestCount + 2));
             verify(mockEstimatedHeapUsageCollector).collectClusterHeapUsage(any()); // Should have polled for heap usage
+            verify(mockEstimatedHeapUsageCollector).collectShardHeapUsage(any());
             verify(nodeUsageStatsForThreadPoolsCollector).collectUsageStats(any(), any(), any());
         }
 
@@ -202,6 +203,7 @@ public void reroute(String reason, Priority priority, ActionListener<Void> liste
             deterministicTaskQueue.runAllRunnableTasks();
             assertThat(client.requestCount, equalTo(initialRequestCount + 2)); // should have run two client requests per interval
             verify(mockEstimatedHeapUsageCollector).collectClusterHeapUsage(any()); // Should poll for heap usage once per interval
+            verify(mockEstimatedHeapUsageCollector).collectShardHeapUsage(any());
             verify(nodeUsageStatsForThreadPoolsCollector).collectUsageStats(any(), any(), any());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private static Map<ShardId, ShardAndIndexHeapUsage> randomShardHeapUsages() {`
`74`	`74`	`int numEntries = randomIntBetween(0, 128);`
`75`	`75`	`Map<ShardId, ShardAndIndexHeapUsage> shardHeapUsageBuilder = new HashMap<>(numEntries);`
`76`	`76`	`for (int i = 0; i < numEntries; i++) {`
`77`		`- shardHeapUsageBuilder.put(randomShardId(), new ShardAndIndexHeapUsage(randomLong(), randomLong()));`
	`77`	`+ shardHeapUsageBuilder.put(randomShardId(), new ShardAndIndexHeapUsage(randomNonNegativeLong(), randomNonNegativeLong()));`
`78`	`78`	`}`
`79`	`79`	`return shardHeapUsageBuilder;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ public void reroute(String reason, Priority priority, ActionListener<Void> liste`
`154`	`154`	`// should have run two client requests: nodes stats request and indices stats request`
`155`	`155`	`assertThat(client.requestCount, equalTo(initialRequestCount + 2));`
`156`	`156`	`verify(mockEstimatedHeapUsageCollector).collectClusterHeapUsage(any()); // Should have polled for heap usage`
	`157`	`+ verify(mockEstimatedHeapUsageCollector).collectShardHeapUsage(any());`
`157`	`158`	`verify(nodeUsageStatsForThreadPoolsCollector).collectUsageStats(any(), any(), any());`
`158`	`159`	`}`
`159`	`160`
`@@ -202,6 +203,7 @@ public void reroute(String reason, Priority priority, ActionListener<Void> liste`
`202`	`203`	`deterministicTaskQueue.runAllRunnableTasks();`
`203`	`204`	`assertThat(client.requestCount, equalTo(initialRequestCount + 2)); // should have run two client requests per interval`
`204`	`205`	`verify(mockEstimatedHeapUsageCollector).collectClusterHeapUsage(any()); // Should poll for heap usage once per interval`
	`206`	`+ verify(mockEstimatedHeapUsageCollector).collectShardHeapUsage(any());`
`205`	`207`	`verify(nodeUsageStatsForThreadPoolsCollector).collectUsageStats(any(), any(), any());`
`206`	`208`	`}`
`207`	`209`