Fix geo ip database file leak when processing IP arrays #93177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbaiera
added
>bug
:Data Management/Ingest Node
elasticsearchmachine
added
the
Team:Data Management
|
Pinging @elastic/es-data-management (Team:Data Management) |
|
Hi @jbaiera, I've created a changelog YAML for you. |
|
@elasticmachine run elasticsearch-ci/part-1 |
masseyke
approved these changes
Jan 24, 2023
There was a problem hiding this comment.
LGTM. Good catch! It seems odd to me that the call to preLookup happens (we hope) in the supplier (DatabaseReaderLazyLoader lazyLoader = this.supplier.get();) but the call to postLookup is explicit. Since the supplier is given to the constructor, it seems possible that a supplier might not ever even call preLookup. We probably ought to fix that at some point. But that is preexisting weirdness not introduced by this PR (and out of scope for it).
jbaiera
added
the
auto-backport-and-merge
💚 Backport successful
|
jbaiera
added a commit
to jbaiera/elasticsearch
that referenced
this pull request
Jan 25, 2023
This PR moves the postLookup call out of the lookup methods in order to correctly decrement the instance counter a single time at the end of the processor call.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
DatabaseReaderLazyLoaderclass keeps track of how many clients are using it at a time. This allows the reader to be cleaned up as soon as the last client using it is complete. This tracking logic takes place by balancing apreLookupmethod with apostLookupmethod on each Geo IP processor invocation. The problem arises when processing an array of IPs. Currently thepostLookupmethod is called for each IP in the array, which can cause the reader to decrement incorrectly. If a new database is installed during processor execution the reader can get stuck open, leaving database files on disk when they should be cleaned up.This PR moves the
postLookupcall out of the lookup methods in order to correctly decrement the instance counter a single time at the end of the processor call.