Fix CIDR trie lookups honoring TTLs (7.0) - #26955
Open
graylog-internal-actions-access[bot] wants to merge 1 commit into
Open
Fix CIDR trie lookups honoring TTLs (7.0)#26955graylog-internal-actions-access[bot] wants to merge 1 commit into
7.0)#26955graylog-internal-actions-access[bot] wants to merge 1 commit into
Conversation
* Fix CIDR trie lookups honoring TTLs * changelog (cherry picked from commit 725feeb)
graylog-internal-actions-access
Bot
requested review from
danotorrey and
ryan-carroll-graylog
August 11, 2026 14:04
kingzacko1
marked this pull request as ready for review
August 11, 2026 14:13
kingzacko1
self-requested a review
August 11, 2026 14:19
ryan-carroll-graylog
approved these changes
Aug 11, 2026
ryan-carroll-graylog
left a comment
ryan-carroll-graylog
left a comment
Contributor
There was a problem hiding this comment.
Looks good and tests successfully on 7.0: https://enterprise-pr-15162.dev.torch.sh/
danotorrey
approved these changes
Aug 11, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Note: This is a backport of #26854 to
7.0.Description
Change default behavior of
CIDRPatriciaTrie.longestPrefixRangeLookupto usenowas the lookup time so that entries added with a TTL that has expired are properly ignored after expiry. Currently, only the enterpriseMongoDBDataAdapteris affected (CSVFileDataAdapterentries cannot be added with a TTL) and the trie is automatically refreshed every hour, so an entry can only ever be at max 1 hour expired, but that's a long time. This change makes the expiry immediate.Motivation and Context
Respect TTL for values added to a MongoDBDataAdapter
How Has This Been Tested?
unit tests
Screenshots (if appropriate):
Types of changes
Checklist: