Skip to content

Re-enable EnterpriseGeoIpDownloaderIT test #133330

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

Closed
szybia wants to merge 1 commit into from
Closed

Re-enable EnterpriseGeoIpDownloaderIT test #133330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions .../internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@
import org.junit.ClassRule;

import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.elasticsearch.ingest.EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER;
import static org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderTaskExecutor.IPINFO_TOKEN_SETTING;
Expand Down Expand Up @@ -151,7 +153,7 @@ public void testEnterpriseDownloaderTask() throws Exception {
}

@After
public void cleanup() throws InterruptedException {
public void cleanup() throws Exception {
/*
* This method cleans up the database configurations that the test created. This allows the test to be run repeatedly.
*/
Expand All @@ -161,6 +163,18 @@ public void cleanup() throws InterruptedException {
.<AcknowledgedResponse>andThen(l -> deleteDatabaseConfiguration(IPINFO_CONFIGURATION, l))
.addListener(listener);
latch.await(10, TimeUnit.SECONDS);
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
AtomicBoolean removeProjectSucceeded = new AtomicBoolean(false);
persistentTasksService.sendProjectRemoveRequest(
ProjectId.DEFAULT,
ENTERPRISE_GEOIP_DOWNLOADER,
TimeValue.MAX_VALUE,
ActionListener.wrap(r -> {
logger.info("stopped enterprise geoip downloader task");
removeProjectSucceeded.set(true);
}, e -> { fail(e, "Failed to stop enterprise geoip downloader task"); })
);
assertBusy(() -> assertTrue(removeProjectSucceeded.get()));
}

private void deleteDatabaseConfiguration(String configurationName, ActionListener<AcknowledgedResponse> listener) {
Expand All @@ -172,21 +186,29 @@ private void deleteDatabaseConfiguration(String configurationName, ActionListene
);
}

private void startEnterpriseGeoIpDownloaderTask(ProjectId projectId) {
private void startEnterpriseGeoIpDownloaderTask(ProjectId projectId) throws Exception {
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
AtomicBoolean completed = new AtomicBoolean(false);
persistentTasksService.sendProjectStartRequest(
projectId,
Copy link
Contributor Author

@szybia szybia Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently projectId is always DEFAULT

i wonder is another reliability improvement would be to use random projectIds

removes possibility of state spillover even more

ENTERPRISE_GEOIP_DOWNLOADER,
ENTERPRISE_GEOIP_DOWNLOADER,
new EnterpriseGeoIpTask.EnterpriseGeoIpTaskParams(),
TimeValue.MAX_VALUE,
ActionListener.wrap(r -> logger.debug("Started enterprise geoip downloader task"), e -> {
ActionListener.wrap(r -> {
logger.info("Started enterprise geoip downloader task");
completed.set(true);
}, e -> {
Throwable t = e instanceof RemoteTransportException ? ExceptionsHelper.unwrapCause(e) : e;
if (t instanceof ResourceAlreadyExistsException == false) {
logger.error("failed to create enterprise geoip downloader task", e);
if (t instanceof ResourceAlreadyExistsException) {
logger.info("enterprise geoip downloader task already started");
completed.set(true);
} else {
fail(e, "Failed to create enterprise geoip downloader task");
}
})
);
assertBusy(() -> assertTrue(completed.get()));
}

private void configureMaxmindDatabase(String databaseType) {
Expand Down Expand Up @@ -220,7 +242,8 @@ private void waitAround() throws Exception {
assertBusy(() -> {
SearchResponse searchResponse = client().search(new SearchRequest(GeoIpDownloader.DATABASES_INDEX)).actionGet();
try {
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
final var hits = searchResponse.getHits().getHits();
assertThat(Arrays.toString(hits), hits.length, equalTo(2));
} finally {
searchResponse.decRef();
}
Expand Down
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,6 @@ tests:
- class: org.elasticsearch.smoketest.MlWithSecurityIT
method: test {yaml=ml/trained_model_cat_apis/Test cat trained models}
issue: https://github.com/elastic/elasticsearch/issues/125750
- class: org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT
method: testEnterpriseDownloaderTask
issue: https://github.com/elastic/elasticsearch/issues/126124
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=transform/transforms_start_stop/Test start/stop only starts/stops specified transform}
issue: https://github.com/elastic/elasticsearch/issues/126466
Expand Down