Skip to content

Conversation

@nielsbauman
Copy link
Contributor

Backport

This will backport the following commits from main to 8.19:

Questions ?

Please refer to the Backport tool documentation

…ic#137660)

In elastic#134223, we modified the concurrency design of the `EnterpriseGeoIpDownloader`. Before that, both `EnterpriseGeoIpDownloader` and `GeoIpDownloader` shared the exact same concurrency implementation. In this PR, we move the improved concurrency design of `EnterpriseGeoIpDownloader` to `AbstractGeoIpDownloader` and make `GeoIpDownloader` extend this class as well. This way, both classes are aligned on the concurrency implementation and will both benefit from any future improvements/modifications.

There is likely more logic in these two classes that can be moved to the abstract class, but I'm leaving that for future work, to keep the scope of this PR limited to the concurrency improvements.

Incidentally, I am optimistic that this will resolve the following test failures. I've been running the GeoIP YAML test suites for thousands of iterations on `main`, but haven't been able to reproduce the failures at all. The reported failure messages are almost exactly the same as the one in elastic#126124, which was addressed by elastic#134223. Therefore, I'm closing these issues for now.
Closes elastic#130681
Closes elastic#133597
Closes elastic#135132
Closes elastic#135158

(cherry picked from commit edb40c5)

# Conflicts:
#	modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloader.java
#	modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java
#	modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTaskExecutor.java
@nielsbauman nielsbauman added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP >bug Team:Data Management Meta label for data/management team labels Nov 8, 2025
@elasticsearchmachine elasticsearchmachine merged commit 21ba76a into elastic:8.19 Nov 8, 2025
23 checks passed
@nielsbauman nielsbauman deleted the backport/8.19/pr-137660 branch November 8, 2025 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport >bug :Data Management/Ingest Node Execution or management of Ingest Pipelines including GeoIP Team:Data Management Meta label for data/management team v8.19.8

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants