stream: fix merge abort for pending sources#64013
Open
trivikr wants to merge 1 commit into
Open
Conversation
Collaborator
|
Review requested:
|
655c543 to
315d0b2
Compare
Wake the multi-source merge loop when its abort signal fires so a pending read rejects instead of waiting for another source to settle. When the primary error is the abort reason, do not await iterator cleanup because sources may already be stuck in pending next() calls. Fixes: nodejs#64012 Signed-off-by: Kamat, Trivikram <[email protected]> Assisted-by: openai:gpt-5.5
315d0b2 to
3e14c1a
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
2 participants
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.
Fixes: #64012
This fixes
stream/itermerge()hanging when an abort signal fires whilethe multi-source merge loop is waiting for pending source reads.
The change wakes the pending merge waiter on abort so the next read rejects
with
AbortError. It also avoids awaiting iterator cleanup when the primaryerror is the abort reason, since a source may already be stuck in a pending
next()call.Assisted-by: openai:gpt-5.5