Skip to content

Wait for nodes to have downloaded databases in GeoIpDownloaderIT #137636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2025
Merged

Wait for nodes to have downloaded databases in GeoIpDownloaderIT #137636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa3e9c0
Wait for nodes to have downloaded databases in `GeoIpDownloaderIT`
nielsbauman Nov 5, 2025
3efdfdb
Merge branch 'main' into geoip-test-fix
nielsbauman Nov 6, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions ...-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ public void testInvalidTimestamp() throws Exception {

putGeoIpPipeline();
verifyUpdatedDatabase();
awaitAllNodesDownloadedDatabases();

updateClusterSettings(Settings.builder().put("ingest.geoip.database_validity", TimeValue.timeValueMillis(1)));
updateClusterSettings(
Expand Down Expand Up @@ -215,6 +216,7 @@ public void testInvalidTimestamp() throws Exception {
}
}
});
awaitAllNodesDownloadedDatabases();
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/92888")
Expand Down Expand Up @@ -305,6 +307,7 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception {
assertNotNull(task);
assertNotNull(task.getState());
});
awaitAllNodesDownloadedDatabases();
putNonGeoipPipeline(pipelineId);
assertNotNull(getTask().getState()); // removing all geoip processors should not result in the task being stopped
assertBusy(() -> {
Expand Down Expand Up @@ -350,6 +353,7 @@ public void testDoNotDownloadDatabaseOnPipelineCreation() throws Exception {
containsInAnyOrder("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb", "MyCustomGeoLite2-City.mmdb")
);
}, 2, TimeUnit.MINUTES);
awaitAllNodesDownloadedDatabases();

// Remove the created index.
assertAcked(indicesAdmin().prepareDelete(indexIdentifier).get());
Expand Down Expand Up @@ -411,6 +415,7 @@ public void testUseGeoIpProcessorWithDownloadedDBs() throws Exception {
}, 20, TimeUnit.SECONDS);

verifyUpdatedDatabase();
awaitAllNodesDownloadedDatabases();

// Disable downloader:
updateClusterSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), false));
Expand Down Expand Up @@ -453,6 +458,7 @@ public void testStartWithNoDatabases() throws Exception {
// Enable downloader:
updateClusterSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true));
verifyUpdatedDatabase();
awaitAllNodesDownloadedDatabases();
}

private void verifyUpdatedDatabase() throws Exception {
Expand All @@ -473,6 +479,27 @@ private void verifyUpdatedDatabase() throws Exception {
});
}

/**
* Waits until all ingest nodes report having downloaded the expected databases. This ensures that all ingest nodes are in a consistent
* state and prevents us from deleting databases before they've been downloaded on all nodes.
*/
private void awaitAllNodesDownloadedDatabases() throws Exception {
assertBusy(() -> {
GeoIpStatsAction.Response response = client().execute(GeoIpStatsAction.INSTANCE, new GeoIpStatsAction.Request()).actionGet();
assertThat(response.getNodes(), not(empty()));

for (GeoIpStatsAction.NodeResponse nodeResponse : response.getNodes()) {
if (nodeResponse.getNode().isIngestNode() == false) {
continue;
}
assertThat(
nodeResponse.getDatabases(),
containsInAnyOrder("GeoLite2-Country.mmdb", "GeoLite2-City.mmdb", "GeoLite2-ASN.mmdb", "MyCustomGeoLite2-City.mmdb")
);
}
});
}

private GeoIpTaskState getGeoIpTaskState() {
PersistentTasksCustomMetadata.PersistentTask<PersistentTaskParams> task = getTask();
assertNotNull(task);
Expand Down