relay: fix reentrant wake-while-iterating in pending rendezvous tree - #652
Open
akash-a-n wants to merge 1 commit into
Open
relay: fix reentrant wake-while-iterating in pending rendezvous tree#652akash-a-n wants to merge 1 commit into
akash-a-n wants to merge 1 commit into
Conversation
wakePendingRendezvousForTrack/wakePendingRendezvousSubtree called waiter->signal() while iterating waitersByTrack/children. TimedBaton:: signal() can resume the parked coroutine synchronously, re-entering erasePendingRendezvous() and mutating the same container the wake loop is still iterating over. Split each wake path into two phases: walk/prune the tree and collect every waiter into a local vector (renaming wakePendingRendezvousSubtree to collectPendingRendezvousSubtree to reflect this), then signal the collected waiters only after all tree mutation is complete. Add regression tests parking two waiters on the same track / on different tracks under the same namespace, asserting both resolve when woken by a single PUBLISH / PUBLISH_NAMESPACE.
akash-a-n
force-pushed
the
fix/reentry-bug
branch
from
August 28, 2026 12:18
007f8a5 to
289cc19
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.
wakePendingRendezvousForTrack/wakePendingRendezvousSubtree called waiter->signal() while iterating waitersByTrack/children. TimedBaton:: signal() can resume the parked coroutine synchronously, re-entering erasePendingRendezvous() and mutating the same container the wake loop is still iterating over.
Split each wake path into two phases: walk/prune the tree and collect every waiter into a local vector (renaming wakePendingRendezvousSubtree to collectPendingRendezvousSubtree to reflect this), then signal the collected waiters only after all tree mutation is complete.
Add regression tests parking two waiters on the same track / on different tracks under the same namespace, asserting both resolve when woken by a single PUBLISH / PUBLISH_NAMESPACE.
This change is