CAMEL-24321: Allow stream caching spool directory to be resolved per-Exchange - #25360
Draft
gnodet wants to merge 1 commit into
Draft
CAMEL-24321: Allow stream caching spool directory to be resolved per-Exchange#25360gnodet wants to merge 1 commit into
gnodet wants to merge 1 commit into
Conversation
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 558 tested, 29 compile-only — current: 558 all testedMaveniverse Scalpel detected 587 affected modules (current approach: 558).
|
…Exchange Add resolveSpoolDirectory(Exchange) default method to StreamCachingStrategy interface. The default delegates to getSpoolDirectory(), so existing custom implementations continue to work unchanged. CachedOutputStream now stores the Exchange and passes it through to TempFileManager.createOutputStream(), which calls the new method instead of the zero-arg getSpoolDirectory(). This allows custom StreamCachingStrategy implementations to return a per-route or per-exchange spool directory, enabling spool data isolation and per-route monitoring of spool usage. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
davsclaus
force-pushed
the
investigate-and-fix-camel-24321-stream-caching
branch
from
August 6, 2026 12:35
797f92e to
a021dbe
Compare
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
1 participant
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
Allow the stream caching spool directory to be resolved per-Exchange, so custom
StreamCachingStrategyimplementations can direct each route's spooled bytes to a separate directory.Problem: The spool directory is resolved once at startup in
DefaultStreamCachingStrategy.doStart()and stored as a single context-wideFile. TheExchangeis available inCachedOutputStream's constructor but is dropped before the spool directory is selected inTempFileManager.createOutputStream(). This makes it impossible for custom strategies to make per-route decisions.Fix (3 source files, 1 test file):
StreamCachingStrategy(camel-api): Adddefault File resolveSpoolDirectory(Exchange exchange)method that falls back togetSpoolDirectory(). Full backward compatibility — existing custom implementations compile and work unchanged.CachedOutputStream(camel-support): Store theExchangeas a field and pass it throughpageToFileStream()toTempFileManager.createOutputStream().FileInputStreamCache.TempFileManager(camel-support): Callstrategy.resolveSpoolDirectory(exchange)instead ofstrategy.getSpoolDirectory(). Create the resolved directory on-demand if it doesn't exist.Usage example:
Test plan
testDefaultResolveSpoolDirectoryReturnsSameDirectory— default behavior unchangedtestPerExchangeSpoolDirectoryResolution— custom strategy routes to per-route subdirectorytestPerExchangeSpoolDirWithDifferentRoutes— two routes spool to different subdirectoriestestPerExchangeSpoolDirFallsBackWhenNoRouteId— falls back to base directory when no route IDCachedOutputStreamTesttests pass (8/8)StreamCaching*Testtests pass (18/18)🤖 Generated with Claude Code on behalf of @gnodet