Repository navigation
fix(net): revoke subscriptions during joining FETCH setup #5654
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d912a0f
chore: claim joining FETCH revocation quest
kixelated 0e34c2e
fix(net): revoke subscriptions during joining FETCH setup
kixelated 2186bf2
Merge remote-tracking branch 'origin/main' into merge-5654
kixelated 56d420b
fix(net): count overlapping legacy request send holds
kixelated File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When two joining FETCH tasks run concurrently on a multithreaded executor, both can return from
next_request_idbefore either reachessending(): the first task releases the state lock after allocating its ID, allowing the second to allocate the next ID and write its header first. The counter only blocks a third allocation, so a draft-14/15 peer can still receive request IDs out of sequence and close the session withINVALID_REQUEST_ID. Return the ID and its send hold from one locked operation so allocation order also orders header publication.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed that allocation and header order are not atomic, but this race is not introduced here and is not specific to joining FETCH. Every legacy request (SUBSCRIBE, FETCH, PUBLISH_NAMESPACE, ...) calls
next_request_idand writes its header afterwards, so two tasks on different threads can already publish IDs out of order on main. On the adapter path the window is also tiny:VirtualSendStreamwrites never pend, so the header is queued synchronously right after allocation.The hold in this PR only keeps a header that was committed before its subscription cancelled from being overtaken. The counter (56d420b) fixes the narrower bug where two overlapping holds tripped the
debug_assertand the first release unblocked allocation early.Making allocation and header publication atomic for all request types is a broader change to the request-ID API, so I'm leaving it for a follow-up instead of adding it here.
(Written by Opus 5.5)