From deeb9070ee7a26bdeb5c34c89f4ba391c055d145 Mon Sep 17 00:00:00 2001 From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com> Date: Wed, 26 Nov 2025 10:32:12 +0100 Subject: [PATCH] Extend timeout in `IngestGeoIpClientYamlTestSuiteIT` (#138610) Some slow CI test clusters are not able to download all four GeoIP databases within 10 seconds, so we bump the timeout to 20 seconds. See #138460 for a more detailed analysis. Fixes #138460 Fixes #138502 (cherry picked from commit 4fb85c605839cadf0f0bdcb95834cb9d296f5e72) # Conflicts: # modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java # muted-tests.yml --- .../ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java b/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java index f7943342b5352..a5346d3b4ca53 100644 --- a/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java +++ b/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; @@ -92,7 +93,9 @@ public void waitForDatabases() throws Exception { databaseNames, containsInAnyOrder("GeoLite2-City.mmdb", "GeoLite2-Country.mmdb", "GeoLite2-ASN.mmdb", "MyCustomGeoLite2-City.mmdb") ); - }); + // Downloading all four databases may take some time, so we set a longer timeout here. + // If 20 seconds prove insufficient, we should first investigate whether we can speed up the database downloader. + }, 20, TimeUnit.SECONDS); } /**