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: always defer readable in EOF when sync #18615

Closed
wants to merge 2 commits into from
Closed

stream: always defer readable in EOF when sync #18615

wants to merge 2 commits into from

Conversation

mcollina
Copy link
Member

@mcollina mcollina commented Feb 7, 2018

Alternative to #18612

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
Affected core subsystem(s)

stream

@nodejs-github-bot nodejs-github-bot added the stream Issues and PRs related to the stream subsystem. label Feb 7, 2018
@mcollina
Copy link
Member Author

mcollina commented Feb 7, 2018

cc @mafintosh @addaleax @cjihrig

@mcollina
Copy link
Member Author

mcollina commented Feb 7, 2018

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

mafintosh
mafintosh reviewed Feb 7, 2018
View reviewed changes
lib/_stream_readable.js Outdated
@@ -488,7 +488,7 @@ function onEofChunk(stream, state) {
}
state.ended = true;

if (state.sync && state.length) {
if (state.sync) {
// if we are sync and have data in the buffer, wait until next tick
Copy link
Member

Choose a reason for hiding this comment

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

prob wanna remove the "and have data in the buffer" part of the comment now

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@mafintosh
Copy link
Member

👍

@mcollina
Copy link
Member Author

mcollina commented Feb 7, 2018

This can land, I propose to fast-track it to fix the CITGM failures.

@mcollina mcollina added the fast-track PRs that do not need to wait for 48 hours to land. label Feb 7, 2018
@mcollina mcollina requested a review from a team February 7, 2018 13:19
@mafintosh mafintosh mentioned this pull request Feb 7, 2018
Closed
@mcollina
Copy link
Member Author

mcollina commented Feb 7, 2018

CITGM: https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/1264/
CITGM (master): https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/1265/
(again before landing, to be sure)

@mcollina
Copy link
Member Author

mcollina commented Feb 8, 2018

Landing now

@mcollina
Copy link
Member Author

mcollina commented Feb 8, 2018

Landed as 87b9bce

@mcollina mcollina closed this Feb 8, 2018
@mcollina mcollina deleted the defer-readable branch February 8, 2018 11:03
mcollina added a commit that referenced this pull request Feb 8, 2018
@mcollina
stream: always defer readable in EOF when sync
87b9bce 
Fix a regression introduced by
#18515 that broke
the dicer module tests.

See: #18515

PR-URL: #18615
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
@MylesBorins
Copy link
Contributor

Should this be backported to v9.x-staging? If yes please follow the guide and raise a backport PR, if not let me know or add the dont-land-on label.

@mcollina
Copy link
Member Author

This should not be backported.

MayaLekova pushed a commit to MayaLekova/node that referenced this pull request May 8, 2018
@mcollina @MayaLekova
stream: always defer readable in EOF when sync
f500c4e 
Fix a regression introduced by
nodejs#18515 that broke
the dicer module tests.

See: nodejs#18515

PR-URL: nodejs#18615
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mafintosh mafintosh mafintosh left review comments

@benjamingr benjamingr benjamingr approved these changes

@cjihrig cjihrig cjihrig approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

Assignees
No one assigned
Labels
fast-track PRs that do not need to wait for 48 hours to land. 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.
7 participants
@mcollina @mafintosh @MylesBorins @benjamingr @cjihrig @BridgeAR @nodejs-github-bot