CAMEL-23513: Fix completeAllOnStop() not completing aggregations with completionInterval()#23235
Merged
gnodet merged 2 commits intoMay 14, 2026
Merged
Conversation
… completionInterval() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
davsclaus
approved these changes
May 14, 2026
Contributor
|
🧪 CI tested the following changed modules:
Build reactor — dependencies compiled but only changed modules were tested (2 modules)
|
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.
CAMEL-23513
Summary
completeAllOnStop()not reliably completing in-flight aggregations when used withcompletionInterval()AggregateProcessor.prepareShutdown()now also force-completes all groups whencompleteAllOnStopis set, not just whenforceCompletionOnStopis settestCompleteAllOnStopWithCompletionIntervalOnlytest by addressing the underlying race, and update it to use a 60-second interval so it deterministically validates force completion rather than relying on the interval timer to race against shutdownRoot Cause
prepareShutdown()only checkedforceCompletionOnStopto triggerdoForceCompletionOnStop(). WithcompleteAllOnStop, the shutdown relied on theAggregationIntervalTaskfiring during the shutdown window — a race condition that caused theAggregateCompleteAllOnStopWithIntervalTestto fail intermittently.Test plan
AggregateCompleteAllOnStopWithIntervalTestpasses deterministically (20/20 runs)org.apache.camel.processor.aggregator.*) passes with no regressions