From 9054353ffec68d0e3f28b9d0e3bd7ea2f696aed5 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Mon, 11 Aug 2025 10:01:59 +0200 Subject: [PATCH] Fix testLimitConcurrentNodes --- muted-tests.yml | 3 --- .../plugin/DataNodeRequestSenderTests.java | 23 +++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index f0458b372c1cd..19978010012f0 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -521,9 +521,6 @@ tests: - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT method: test {csv-spec:lookup-join.MvJoinKeyFromRowExpanded} issue: https://github.com/elastic/elasticsearch/issues/132604 -- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderTests - method: testLimitConcurrentNodes - issue: https://github.com/elastic/elasticsearch/issues/132607 - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version} issue: https://github.com/elastic/elasticsearch/issues/132608 diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderTests.java index e9f38f5bbe4eb..b6ad5b5837acd 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestSenderTests.java @@ -306,13 +306,16 @@ public void testDoNotRetryCircuitBreakerException() { } public void testLimitConcurrentNodes() { - var targetShards = List.of( - targetShard(shard1, node1), - targetShard(shard2, node2), - targetShard(shard3, node3), - targetShard(shard4, node4), - targetShard(shard5, node5) - ); + final int shards = 10; + var targetShards = new ArrayList(shards); + for (int i = 0; i < shards; i++) { + targetShards.add( + targetShard( + new ShardId("index", "n/a", i), + DiscoveryNodeUtils.builder("node-" + i).roles(Set.of(DATA_HOT_NODE_ROLE)).build() + ) + ); + } var concurrency = randomIntBetween(1, 2); AtomicInteger maxConcurrentRequests = new AtomicInteger(0); @@ -335,10 +338,10 @@ public void testLimitConcurrentNodes() { listener.onResponse(new DataNodeComputeResponse(DriverCompletionInfo.EMPTY, Map.of())); }); })); - assertThat(sent.size(), equalTo(5)); + assertThat(sent.size(), equalTo(shards)); assertThat(maxConcurrentRequests.get(), equalTo(concurrency)); - assertThat(response.totalShards, equalTo(5)); - assertThat(response.successfulShards, equalTo(5)); + assertThat(response.totalShards, equalTo(shards)); + assertThat(response.successfulShards, equalTo(shards)); assertThat(response.failedShards, equalTo(0)); }