[SPARK-55701][SS] Fix race condition in CompactibleFileStreamLog.allFiles#54500
Open
zeruibao wants to merge 2 commits intoapache:masterfrom
Open
[SPARK-55701][SS] Fix race condition in CompactibleFileStreamLog.allFiles#54500zeruibao wants to merge 2 commits intoapache:masterfrom
zeruibao wants to merge 2 commits intoapache:masterfrom
Conversation
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.
What changes were proposed in this pull request?
Changed the exception type thrown in
CompactibleFileStreamLog.allFiles()fromIllegalStateExceptiontoFileNotFoundExceptionwhen a batch metadata file is missing (line 270). SinceFileNotFoundExceptionextendsIOException, the existing retry loop (line 277) now catches this case and retries with an updatedlatestId.Why are the changes needed?
There is a race condition between a batch reader (e.g.,
DESCRIBE TABLEvia Thrift server) and a streaming writer performing compaction + cleanup concurrently:getLatestBatchId()and observeslatestId = N.deleteExpiredLogremoves old batch files.latestId.The
allFiles()method already has a retry loop designed to handle this exact scenario — it catchesIOException, refresheslatestId, and retries. However, the missing-file case was throwingIllegalStateException, which is not a subclass ofIOException, so it escaped the retry loop entirely and surfaced as a fatal error to the user.The fix changes the exception to
FileNotFoundExceptionso the existing retry logic handles it correctly. The safety check on re-throw (lines 284-286) ensures that if no newer compaction exists, the exception is still propagated rather than silently swallowed.Does this PR introduce any user-facing change?
No
How was this patch tested?
UT
Was this patch authored or co-authored using generative AI tooling?
Get help with Claude 4.6 Opus but also review it carefully.