From 88181266c98997bf2c9cadeb905d24a3bcf13b42 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 11 Jul 2025 13:59:55 -0400 Subject: [PATCH] ESQL: Shore up test (#130217) Adds a `_forcemerge` to a test to try and avoid spurious failures. The tests expect everything in one segment and the bulk mostly does that- but `_forcemerge` should *double* force it. Closes #129975 --- .../esql/qa/single_node/StoredFieldsSequentialIT.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java index 19db8b798cfad..27073e302de0d 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java @@ -194,6 +194,15 @@ public void buildIndex() throws IOException { bulk.setJsonEntity(b.toString()); Response bulkResponse = client().performRequest(bulk); assertThat(entityToMap(bulkResponse.getEntity(), XContentType.JSON), matchesMap().entry("errors", false).extraOk()); + + // Forcemerge to one segment to get more consistent results. + Request forcemerge = new Request("POST", "/_forcemerge"); + forcemerge.addParameter("max_num_segments", "1"); + Response forcemergeResponse = client().performRequest(forcemerge); + assertThat( + entityToMap(forcemergeResponse.getEntity(), XContentType.JSON), + matchesMap().entry("_shards", matchesMap().entry("failed", 0).entry("successful", greaterThanOrEqualTo(1)).extraOk()).extraOk() + ); } @Override