Add cleanup() to URLFilter and fix timer/client leak in JSONURLFilterWrapper#1867
Merged
Add cleanup() to URLFilter and fix timer/client leak in JSONURLFilterWrapper#1867
Conversation
Add cleanup() lifecycle method to URLFilter (mirroring ParseFilter.cleanup()) and wire it through URLFilters, StatusEmitterBolt, URLFilterBolt, and all bolt subclasses via super.cleanup() calls. The Timer and RestHighLevelClient in JSONURLFilterWrapper were created inside an anonymous TimerTask with no way to cancel or close them. The timer thread runs forever and the client's connection pool is never shut down. Store both as instance fields and override cleanup() to cancel the timer and close the client. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
rzo1
approved these changes
Apr 2, 2026
Contributor
|
Needs checkstyle |
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
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.
Summary
cleanup()lifecycle method toURLFilter, mirroring the existingParseFilter.cleanup()patternURLFilters,StatusEmitterBolt,URLFilterBolt, and all bolt subclasses viasuper.cleanup()callsJSONURLFilterWrapper: theTimerandRestHighLevelClientwere created inside an anonymousTimerTaskwith no way to cancel or close them — the timer thread runs forever and the client's connection pool is never shut downcleanup()to cancel the timer and close the clientChanges
URLFilter: addcleanup()no-op method (matchesParseFilter)URLFilters: overridecleanup()to iterate and call it on each filterStatusEmitterBolt: addcleanup()that callsurlFilters.cleanup()URLFilterBolt: addcleanup()that callsurlFilters.cleanup()super.cleanup()call soURLFilterscleanup is reachedJSONURLFilterWrapper: store timer/client as fields, overridecleanup()Test plan
mvn compile -pl external/opensearch -ammvn test -pl core)🤖 Generated with Claude Code