Skip to content

Avoiding race conditions in GeoIpDownloaderIT #93363

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
masseyke merged 3 commits into from
Jan 31, 2023
Merged

Avoiding race conditions in GeoIpDownloaderIT #93363

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9352e29
Avoiding race conditions in GeoIpDownloaderIT
masseyke Jan 30, 2023
f93be70
adding another assertion
masseyke Jan 31, 2023
dfd49db
fixing typo
masseyke Jan 31, 2023
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
7 changes: 6 additions & 1 deletion ...-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 @@ -254,6 +254,7 @@ public void testGeoIpDatabasesDownload() throws Exception {
assertBusy(() -> {
GeoIpTaskState state = getGeoIpTaskState();
assertEquals(Set.of("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb"), state.getDatabases().keySet());
putGeoIpPipeline(); // This is to work around the race condition described in #92888
}, 2, TimeUnit.MINUTES);

for (String id : List.of("GeoLite2-ASN.mmdb", "GeoLite2-City.mmdb", "GeoLite2-Country.mmdb")) {
Expand Down Expand Up @@ -309,7 +310,11 @@ public void testGeoIpDatabasesDownloadNoGeoipProcessors() throws Exception {
.setPersistentSettings(Settings.builder().put(GeoIpDownloaderTaskExecutor.ENABLED_SETTING.getKey(), true))
.get();
assertTrue(settingsResponse.isAcknowledged());
assertBusy(() -> { assertNull(getTask().getState()); });
assertBusy(() -> {
assertNotNull(getTask());
assertNull(getTask().getState());
putGeoIpPipeline(); // This is to work around the race condition described in #92888
});
putNonGeoipPipeline(pipelineId);
assertBusy(() -> { assertNull(getTask().getState()); });
putNonGeoipPipeline(pipelineId);
Expand Down