From a64b3cda77385720768d6d681c936bc05e021158 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Thu, 18 Jul 2024 09:46:03 -0400 Subject: [PATCH 1/2] ESQL: Fix test failure around field loading Bumps the time limit. Sometimes the test data is big enough to warrant more time. And CI isn't always fast. Closes #111048 Closes #110244 --- muted-tests.yml | 6 ------ .../lucene/ValueSourceReaderTypeConversionTests.java | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 3e64358a98503..49061301c7fd7 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -58,9 +58,6 @@ tests: - class: org.elasticsearch.upgrades.SecurityIndexRolesMetadataMigrationIT method: testMetadataMigratedAfterUpgrade issue: https://github.com/elastic/elasticsearch/issues/110232 -- class: org.elasticsearch.compute.lucene.ValueSourceReaderTypeConversionTests - method: testLoadAll - issue: https://github.com/elastic/elasticsearch/issues/110244 - class: org.elasticsearch.backwards.SearchWithMinCompatibleSearchNodeIT method: testMinVersionAsNewVersion issue: https://github.com/elastic/elasticsearch/issues/95384 @@ -113,9 +110,6 @@ tests: issue: https://github.com/elastic/elasticsearch/issues/111041 - class: org.elasticsearch.xpack.esql.querydsl.query.SingleValueQueryTests issue: https://github.com/elastic/elasticsearch/issues/111042 -- class: org.elasticsearch.compute.lucene.ValueSourceReaderTypeConversionTests - method: testLoadAllStatusAllInOnePage - issue: https://github.com/elastic/elasticsearch/issues/111048 # Examples: # diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/ValueSourceReaderTypeConversionTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/ValueSourceReaderTypeConversionTests.java index e88f6141049be..ccc3dea78adc8 100644 --- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/ValueSourceReaderTypeConversionTests.java +++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/ValueSourceReaderTypeConversionTests.java @@ -1549,7 +1549,11 @@ protected void start(Driver driver, ActionListener driverListener) { PlainActionFuture future = new PlainActionFuture<>(); try { driverRunner.runToCompletion(drivers, future); - future.actionGet(TimeValue.timeValueSeconds(30)); + /* + * We use a 3-minute timer because many of the cases can + * take 40 seconds in CI. Locally it's taking 9 seconds. + */ + future.actionGet(TimeValue.timeValueMinutes(3)); } finally { terminate(threadPool); } From e277d8ff1cc27b0df0966fe14138ec30000ddbb6 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 19 Jul 2024 08:28:25 -0400 Subject: [PATCH 2/2] Drop merge error --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index f264f4be52d9e..deafcafb01c2e 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -94,9 +94,6 @@ tests: - class: org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT method: testEnterpriseDownloaderTask issue: https://github.com/elastic/elasticsearch/issues/111002 -- class: org.elasticsearch.datastreams.DataStreamsClientYamlTestSuiteIT - method: test {p0=data_stream/190_failure_store_redirection/Ensure failure is redirected to correct failure store after a reroute processor} - issue: https://github.com/elastic/elasticsearch/issues/111041 - class: org.elasticsearch.action.search.KnnSearchSingleNodeTests method: testKnnSearchAction issue: https://github.com/elastic/elasticsearch/issues/111072