Retry contended path claims during branchless attachment - #3610
Merged
Merged
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.
🚨 SLOP COP 🚨 ·
new-issue-autopilotHuman comments
What was wrong
Branchless checkout attachment failed immediately when another preparation held the path claim. That claim remains held until the first thread finishes attaching. Reproduction report.
What changed
Retry branchless claims every 50 ms for up to the existing 15-minute attachment timeout, honoring cancellation. Preserve exclusive claims and immediate refusal of competing branch changes. Report preparation contention accurately.
The environment provisioning change totals 171 text lines (163 additions, 8 deletions) across 3 files. No dependency, generated file, stored-data, public API, or protocol changes.
How you verified
Fixes #3609