Skip to content

Commit 4fb85c6

Browse files
authored
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
1 parent 594a373 commit 4fb85c6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.List;
3939
import java.util.Map;
4040
import java.util.Objects;
41+
import java.util.concurrent.TimeUnit;
4142

4243
import static org.hamcrest.Matchers.containsInAnyOrder;
4344
import static org.hamcrest.Matchers.equalTo;
@@ -158,7 +159,9 @@ static void assertDatabasesLoaded() throws Exception {
158159

159160
// ensure that the extra config database has been set up, too:
160161
assertThat(node.get("config_databases"), equalTo(List.of("asn.mmdb")));
161-
});
162+
// Downloading all four databases may take some time, so we set a longer timeout here.
163+
// If 20 seconds prove insufficient, we should first investigate whether we can speed up the database downloader.
164+
}, 20, TimeUnit.SECONDS);
162165
}
163166

164167
@SuppressForbidden(reason = "fixtures use java.io.File based APIs")

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,6 @@ tests:
429429
- class: org.elasticsearch.xpack.inference.integration.AuthorizationTaskExecutorIT
430430
method: testCreatesEisChatCompletion_DoesNotRemoveEndpointWhenNoLongerAuthorized
431431
issue: https://github.com/elastic/elasticsearch/issues/138480
432-
- class: org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT
433-
method: test {yaml=ingest_geoip/60_ip_location_databases/Test adding, getting, and removing ip location databases}
434-
issue: https://github.com/elastic/elasticsearch/issues/138502
435432
- class: org.elasticsearch.xpack.exponentialhistogram.ExponentialHistogramFieldMapperTests
436433
method: testFormattedDocValues
437434
issue: https://github.com/elastic/elasticsearch/issues/138504

0 commit comments

Comments
 (0)