From 9d9b6af14d5c3f9ff4cdcc72b3f488e2d2c563c8 Mon Sep 17 00:00:00 2001 From: Dimitris Rempapis Date: Fri, 3 Jan 2025 14:51:08 +0200 Subject: [PATCH 1/6] unmute tests --- muted-tests.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index ec47ec92bbac6..3e104e8a5b0bf 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -163,12 +163,6 @@ tests: - class: org.elasticsearch.xpack.ml.integration.RegressionIT method: testTwoJobsWithSameRandomizeSeedUseSameTrainingSet issue: https://github.com/elastic/elasticsearch/issues/117805 -- class: org.elasticsearch.upgrades.QueryBuilderBWCIT - method: testQueryBuilderBWC {cluster=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/116990 -- class: org.elasticsearch.xpack.restart.QueryBuilderBWCIT - method: testQueryBuilderBWC {p0=UPGRADED} - issue: https://github.com/elastic/elasticsearch/issues/116989 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2UnavailableRemotesIT method: testEsqlRcs2UnavailableRemoteScenarios issue: https://github.com/elastic/elasticsearch/issues/117419 From 02ddf8205360b818ba18beba96dc457a6843e70e Mon Sep 17 00:00:00 2001 From: Dimitris Rempapis Date: Fri, 3 Jan 2025 14:53:03 +0200 Subject: [PATCH 2/6] revert --- muted-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/muted-tests.yml b/muted-tests.yml index 3e104e8a5b0bf..ec47ec92bbac6 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -163,6 +163,12 @@ tests: - class: org.elasticsearch.xpack.ml.integration.RegressionIT method: testTwoJobsWithSameRandomizeSeedUseSameTrainingSet issue: https://github.com/elastic/elasticsearch/issues/117805 +- class: org.elasticsearch.upgrades.QueryBuilderBWCIT + method: testQueryBuilderBWC {cluster=UPGRADED} + issue: https://github.com/elastic/elasticsearch/issues/116990 +- class: org.elasticsearch.xpack.restart.QueryBuilderBWCIT + method: testQueryBuilderBWC {p0=UPGRADED} + issue: https://github.com/elastic/elasticsearch/issues/116989 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2UnavailableRemotesIT method: testEsqlRcs2UnavailableRemoteScenarios issue: https://github.com/elastic/elasticsearch/issues/117419 From aaf815a1d3a07dcf1e26c4c404fcfc5b2ccd7b30 Mon Sep 17 00:00:00 2001 From: Dimitris Rempapis Date: Mon, 17 Feb 2025 17:53:27 +0200 Subject: [PATCH 3/6] update code --- muted-tests.yml | 3 --- .../search/StressSearchServiceReaperIT.java | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index a5e5b7a0b69b4..d4db38ede85e7 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -61,9 +61,6 @@ tests: - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=transform/transforms_start_stop/Verify start transform reuses destination index} issue: https://github.com/elastic/elasticsearch/issues/115808 -- class: org.elasticsearch.search.StressSearchServiceReaperIT - method: testStressReaper - issue: https://github.com/elastic/elasticsearch/issues/115816 - class: org.elasticsearch.xpack.application.connector.ConnectorIndexServiceTests issue: https://github.com/elastic/elasticsearch/issues/116087 - class: org.elasticsearch.xpack.test.rest.XPackRestIT diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index 1b4ed1a19014a..663ed846850ca 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -10,6 +10,8 @@ import org.apache.lucene.tests.util.English; import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.action.search.SearchRequestBuilder; +import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.test.ESIntegTestCase; @@ -33,7 +35,6 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { .build(); } - // see issue #5165 - this test fails each time without the fix in pull #5170 public void testStressReaper() throws ExecutionException, InterruptedException { int num = randomIntBetween(100, 150); IndexRequestBuilder[] builders = new IndexRequestBuilder[num]; @@ -44,7 +45,16 @@ public void testStressReaper() throws ExecutionException, InterruptedException { indexRandom(true, builders); final int iterations = scaledRandomIntBetween(500, 1000); for (int i = 0; i < iterations; i++) { - assertHitCountAndNoFailures(prepareSearch("test").setQuery(matchAllQuery()).setSize(num), num); + SearchResponse response = null; + try { + SearchRequestBuilder searchRequestBuilder = prepareSearch("test").setQuery(matchAllQuery()).setSize(num); + response = searchRequestBuilder.get(); + assertHitCountAndNoFailures(searchRequestBuilder, num); + } finally { + if(response != null) { + response.decRef(); + } + } } } } From 9f1f662a7cb5329e0d368ff147c189193beea588 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 17 Feb 2025 16:05:45 +0000 Subject: [PATCH 4/6] [CI] Auto commit changes from spotless --- .../org/elasticsearch/search/StressSearchServiceReaperIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index 663ed846850ca..532f6bbe3e389 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -51,7 +51,7 @@ public void testStressReaper() throws ExecutionException, InterruptedException { response = searchRequestBuilder.get(); assertHitCountAndNoFailures(searchRequestBuilder, num); } finally { - if(response != null) { + if (response != null) { response.decRef(); } } From 9c315747fe48c0a27187d5423cd72c3f2c01b21b Mon Sep 17 00:00:00 2001 From: Dimitris Rempapis Date: Wed, 19 Feb 2025 11:04:46 +0200 Subject: [PATCH 5/6] revert code --- .../search/StressSearchServiceReaperIT.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index 532f6bbe3e389..8e9839183f498 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -35,6 +35,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { .build(); } + // see issue #5165 - this test fails each time without the fix in pull #5170 public void testStressReaper() throws ExecutionException, InterruptedException { int num = randomIntBetween(100, 150); IndexRequestBuilder[] builders = new IndexRequestBuilder[num]; @@ -45,16 +46,7 @@ public void testStressReaper() throws ExecutionException, InterruptedException { indexRandom(true, builders); final int iterations = scaledRandomIntBetween(500, 1000); for (int i = 0; i < iterations; i++) { - SearchResponse response = null; - try { - SearchRequestBuilder searchRequestBuilder = prepareSearch("test").setQuery(matchAllQuery()).setSize(num); - response = searchRequestBuilder.get(); - assertHitCountAndNoFailures(searchRequestBuilder, num); - } finally { - if (response != null) { - response.decRef(); - } - } + assertHitCountAndNoFailures(prepareSearch("test").setQuery(matchAllQuery()).setSize(num), num); } } } From 9214aabb6ac53effb1d0a9eda231c4d9bc0618dd Mon Sep 17 00:00:00 2001 From: Dimitris Rempapis Date: Wed, 19 Feb 2025 11:05:47 +0200 Subject: [PATCH 6/6] revert imports --- .../org/elasticsearch/search/StressSearchServiceReaperIT.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index 8e9839183f498..1b4ed1a19014a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -10,8 +10,6 @@ import org.apache.lucene.tests.util.English; import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.test.ESIntegTestCase;