fix race condition due to premature disk handle exposure - #13919
Merged
Conversation
… exposure Signed-off-by: Hongbin Ma (Mahone) <mahongbin@apache.org>
Collaborator
Author
|
build |
Contributor
Greptile OverviewGreptile SummaryCherry-pick of PR #13900 to the 25.12 branch. Fixes a race condition in
Confidence Score: 5/5
Important Files ChangedFile Analysis
Sequence DiagramsequenceDiagram
participant Thread_A as Thread A (Spilling)
participant DiskHandleBuilder
participant DiskHandle
participant Thread_B as Thread B (Materializing)
Note over Thread_A: Before Fix (Race Condition)
Thread_A->>DiskHandleBuilder: write data to disk
Thread_A->>DiskHandle: build() - creates handle
Thread_A->>Thread_A: synchronized { disk = staging }
Note right of Thread_A: DiskHandle exposed while<br/>builder still open!
Thread_B->>DiskHandle: materialize() - reads file
Note right of Thread_B: Race: FileChannel still open<br/>by builder
Thread_A->>DiskHandleBuilder: close() - closes FileChannel
Note over Thread_A: After Fix (Safe)
Thread_A->>DiskHandleBuilder: write data to disk
Thread_A->>DiskHandle: build() - creates handle
Thread_A->>DiskHandleBuilder: close() - closes FileChannel
Note right of Thread_A: withResource exits first
Thread_A->>Thread_A: synchronized { disk = staging }
Note right of Thread_A: Now safe to expose
Thread_B->>DiskHandle: materialize() - reads file
Note right of Thread_B: FileChannel properly closed
|
GaryShen2008
approved these changes
Dec 2, 2025
pxLi
approved these changes
Dec 2, 2025
This was referenced Dec 9, 2025
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.
This PR is to cherry pick #13900 to 25.12 branch.