Skip to content
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.

Sign up for GitHub

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

Jump to bottom

stream: make finished try to wait for 'close' #32158

Closed
wants to merge 2 commits into from
Closed

stream: make finished try to wait for 'close' #32158

wants to merge 2 commits into from

Conversation

ronag
Copy link
Member

@ronag ronag commented Mar 9, 2020 •
edited
Loading

Pipeline uses eos which will invoke the callback
on 'finish' and 'end' before all streams have been
fully destroyed.

Fixes: #32032

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@ronag ronag added stream Issues and PRs related to the stream subsystem. semver-major PRs that contain breaking changes and should be released in the next major version. blocked PRs that are blocked by other issues or PRs. labels Mar 9, 2020
@ronag
Copy link
Member Author

ronag commented Mar 9, 2020 •
edited
Loading

This is waiting for/blocked by #32051

@ronag ronag force-pushed the pipeline-wait-for-close branch 3 times, most recently from 18c3de4 to c13abc8 Compare March 9, 2020 16:33
@ronag
Copy link
Member Author

ronag commented Mar 10, 2020

@vweevers

@ronag ronag force-pushed the pipeline-wait-for-close branch 2 times, most recently from 747fbf7 to 059b055 Compare March 10, 2020 07:21
@ronag ronag force-pushed the pipeline-wait-for-close branch from 059b055 to 8f14903 Compare March 10, 2020 10:00
@ronag ronag changed the title stream: make pipeline try to wait for 'close' stream: make finished try to wait for 'close' Mar 10, 2020
@ronag ronag force-pushed the pipeline-wait-for-close branch 2 times, most recently from 9725ba8 to 2fc0856 Compare March 10, 2020 10:03
ronag
ronag commented Mar 10, 2020
View reviewed changes
lib/internal/streams/end-of-stream.js
let writableFinished = stream.writableFinished ||
(wState && wState.finished);
const onfinish = () => {
writableFinished = true;
if (willEmitClose && (!stream.readable || readable)) return;
Copy link
Member Author

@ronag ronag Mar 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!stream.readable || readable is for the case where the stream is Duplex, but we might not want to wait for 'end' in which case autoDestroy won't be called and 'close' won't be emitted. An example of this is:

await pipeline(readable, duplex)

For the last argument duplex, pipeline will set readable: false explicitly for eos to indicate this.

mcollina
mcollina approved these changes Mar 10, 2020
View reviewed changes
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'm ok with this.

ronag referenced this pull request Mar 10, 2020
@ronag
stream: don't destroy final readable stream in pipeline
4d93e10 
If the last stream in a pipeline is still usable/readable
don't destroy it to allow further composition.

Fixes: #32105

PR-URL: #32110
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@ronag ronag force-pushed the pipeline-wait-for-close branch from 2fc0856 to c6cb45b Compare March 11, 2020 15:50
@ronag

This comment has been minimized.

Sign in to view
@szmarczak szmarczak mentioned this pull request Mar 11, 2020
Closed
2 tasks
@addaleax
Copy link
Member

@ronag I guess this is no longer blocked now, but needs a rebase?

@ronag ronag force-pushed the pipeline-wait-for-close branch from c6cb45b to d244303 Compare March 13, 2020 09:23
@ronag ronag added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. and removed blocked PRs that are blocked by other issues or PRs. labels Mar 13, 2020
@addaleax addaleax removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 13, 2020
@addaleax
Copy link
Member

@ronag I’m not sure if this is a new conflict, but the Github UI still says that there are some… also, when adding author ready, make sure that the PR has a fresh CI run :)

@ronag ronag force-pushed the pipeline-wait-for-close branch from d244303 to 4c83a29 Compare March 13, 2020 10:06
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/29811/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/29812/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/29960/

@ronag
Copy link
Member Author

ronag commented Mar 23, 2020

needs another @nodejs/tsc approval

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/29991/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30002/

@ronag ronag requested a review from jasnell March 24, 2020 08:49
@ronag
Copy link
Member Author

ronag commented Mar 25, 2020

rebased to fix conflicts

@ronag ronag force-pushed the pipeline-wait-for-close branch from 735f412 to 81bdea7 Compare March 25, 2020 19:27
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@ronag
stream: make pipeline try to wait for 'close'
4f76b58 
Pipeline uses eos which will invoke the callback
on 'finish' and 'end' before all streams have been
fully destroyed.

Fixes: nodejs#32032
@ronag ronag force-pushed the pipeline-wait-for-close branch from 81bdea7 to 4f76b58 Compare March 25, 2020 19:58
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Mar 25, 2020 •
edited by ronag
Loading

CI: https://ci.nodejs.org/job/node-test-pull-request/30066/
CITGM: https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/2327/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30071/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30080/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30084/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30085/

mcollina
mcollina approved these changes Mar 26, 2020
View reviewed changes
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30086/

@ronag
Copy link
Member Author

ronag commented Mar 26, 2020

green CI & CITGM, waiting for another @nodejs/tsc approval

addaleax pushed a commit that referenced this pull request Mar 27, 2020
@ronag @addaleax
stream: make pipeline try to wait for 'close'
1428a92 
Pipeline uses eos which will invoke the callback
on 'finish' and 'end' before all streams have been
fully destroyed.

Fixes: #32032

PR-URL: #32158
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@addaleax
Copy link
Member

Landed in 1428a92

@addaleax addaleax closed this Mar 27, 2020
@BethGriggs BethGriggs mentioned this pull request Apr 7, 2020
Merged
@ronag ronag mentioned this pull request Apr 20, 2020
Closed
4 tasks
@aduh95 aduh95 mentioned this pull request Apr 24, 2020
Closed
@ronag ronag mentioned this pull request Apr 25, 2020
Closed
4 tasks
@vweevers vweevers mentioned this pull request Jan 24, 2022
Merged
@wh0 wh0 mentioned this pull request Jan 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vweevers vweevers vweevers left review comments

@addaleax addaleax addaleax approved these changes

@mcollina mcollina mcollina approved these changes

@lpinca lpinca Awaiting requested review from lpinca

@jasnell jasnell Awaiting requested review from jasnell

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. semver-major PRs that contain breaking changes and should be released in the next major version. stream Issues and PRs related to the stream subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

finished(stream, cb) invokes callback too early
6 participants
@ronag @addaleax @nodejs-github-bot @mcollina @jasnell @vweevers