From 3f0d57ea392973a528e342f8dcbe986dded925b9 Mon Sep 17 00:00:00 2001 From: "ievgen.degtiarenko" Date: Thu, 22 May 2025 09:04:33 +0200 Subject: [PATCH 1/2] Pick coordinating node --- .../elasticsearch/xpack/esql/action/ManyShardsIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java index 08d59eade600e..dcf641145e228 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java @@ -45,8 +45,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; /** @@ -264,7 +267,7 @@ public void testLimitConcurrentShards() { public void testCancelUnnecessaryRequests() { assumeTrue("Requires pragmas", canUseQueryPragmas()); internalCluster().ensureAtLeastNumDataNodes(3); - + var dataNodes = internalCluster().numDataNodes(); var coordinatingNode = internalCluster().getNodeNames()[0]; var exchanges = new AtomicInteger(0); @@ -281,9 +284,9 @@ public void testCancelUnnecessaryRequests() { query.query("from test-* | LIMIT 1"); query.pragmas(new QueryPragmas(Settings.builder().put(QueryPragmas.MAX_CONCURRENT_NODES_PER_CLUSTER.getKey(), 1).build())); - try (var result = safeGet(client().execute(EsqlQueryAction.INSTANCE, query))) { + try (var result = safeGet(client(coordinatingNode).execute(EsqlQueryAction.INSTANCE, query))) { assertThat(Iterables.size(result.rows()), equalTo(1L)); - assertThat(exchanges.get(), lessThanOrEqualTo(2)); + assertThat(exchanges.get(), allOf(greaterThanOrEqualTo(1), lessThan(dataNodes))); } finally { coordinatorNodeTransport.clearAllRules(); } From 2791e8de8428eca7c9707528a7076ed63ea37a66 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 22 May 2025 07:13:25 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java index dcf641145e228..27541aac3794b 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java @@ -50,7 +50,6 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.lessThan; -import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * Make sures that we can run many concurrent requests with large number of shards with any data_partitioning.