Skip to content

Re-enable GeoIpDownloaderIT#testStartWithNoDatabases() #79907

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
martijnvg merged 3 commits into from
Oct 28, 2021
Merged

Re-enable GeoIpDownloaderIT#testStartWithNoDatabases() #79907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cab26eb
Re-enable GeoIpDownloaderIT#testStartWithNoDatabases()
martijnvg Oct 27, 2021
46ab005
Merge remote-tracking branch 'es/master' into renable_with_logging_te…
martijnvg Oct 27, 2021
313990d
Merge remote-tracking branch 'es/master' into renable_with_logging_te…
martijnvg Oct 28, 2021
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
2 changes: 1 addition & 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 @@ -352,7 +352,7 @@ public void testUseGeoIpProcessorWithDownloadedDBs() throws Exception {
});
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/79074")
@TestLogging(value = "org.elasticsearch.ingest.geoip:TRACE", reason = "https://github.com/elastic/elasticsearch/issues/79074")
public void testStartWithNoDatabases() throws Exception {
assumeTrue("only test with fixture to have stable results", ENDPOINT != null);
putPipeline();
Expand Down
5 changes: 4 additions & 1 deletion modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/DatabaseNodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,11 @@ void updateDatabase(String databaseFileName, String recordedMd5, Path file) {
Predicate<GeoIpProcessor.DatabaseUnavailableProcessor> predicate = p -> databaseFileName.equals(p.getDatabaseName());
var ids = ingestService.getPipelineWithProcessorType(GeoIpProcessor.DatabaseUnavailableProcessor.class, predicate);
if (ids.isEmpty() == false) {
LOGGER.debug("pipelines [{}] found to reload", ids);
for (var id : ids) {
try {
ingestService.reloadPipeline(id);
LOGGER.debug(
LOGGER.trace(
"successfully reloaded pipeline [{}] after downloading of database [{}] for the first time",
id,
databaseFileName
Expand All @@ -343,6 +344,8 @@ void updateDatabase(String databaseFileName, String recordedMd5, Path file) {
);
}
}
} else {
LOGGER.debug("no pipelines found to reload");
}
}
LOGGER.info("successfully reloaded changed geoip database file [{}]", file);
Expand Down