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: avoid destroying http1 objects #32197

Closed
wants to merge 3 commits into from
Closed

stream: avoid destroying http1 objects #32197

wants to merge 3 commits into from

Conversation

ronag
Copy link
Member

@ronag ronag commented Mar 11, 2020

http1 objects are coupled with their corresponding
res/req and cannot be treated independently as
normal streams. Add a special exception for this
in the pipeline cleanup.

Fixes: #32184

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 the stream Issues and PRs related to the stream subsystem. label Mar 11, 2020
@ronag ronag requested a review from addaleax March 11, 2020 12:44
@ronag
Copy link
Member Author

ronag commented Mar 11, 2020

I'm sorry about 8a2b62e causing these troubles. I've tried to resolve these follow up issues as quickly as possible.

@ronag ronag requested a review from mcollina March 11, 2020 12:45
@ronag ronag added the v13.x label Mar 11, 2020
@addaleax addaleax removed the v13.x label Mar 11, 2020
@nodejs-github-bot
Copy link
Collaborator

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

@mcollina
Copy link
Member

@ronag are we sure we should not revert all of those fixes instead and redo a PR with all of them?

mcollina
mcollina approved these changes Mar 11, 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

@ronag
Copy link
Member Author

ronag commented Mar 11, 2020

@ronag are we sure we should not revert all of those fixes instead and redo a PR with all of them?

I would prefer not. Seems more difficult than fixing it.

I see your point though. If you would prefer revert I would be ok with that.

@mcollina
Copy link
Member

Let's see if something else pop up.

@ronag ronag force-pushed the pipeline-fix-destroyer branch 2 times, most recently from 5aeab8d to abd091c Compare March 11, 2020 13:35
@nodejs-github-bot
Copy link
Collaborator

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

@ronag ronag added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 11, 2020
@MylesBorins MylesBorins added the fast-track PRs that do not need to wait for 48 hours to land. label Mar 11, 2020
@MylesBorins
Copy link
Contributor

can we fast track this? I'd like to see it land in the upcoming 13.11.0 release

@ronag looks like this needs a rebase

@ronag
stream: avoid destroying http1 objects
70eabc1 
http1 objects are coupled with their corresponding
res/req and cannot be treated independently as
normal streams. Add a special exception for this
in the pipeline cleanup.

Fixes: nodejs#32184
@ronag
fixup: don't depend on private properties
bed9a32
@ronag
fixup: suggestions
1415464
@ronag
Copy link
Member Author

ronag commented Mar 11, 2020 •
edited
Loading

rebased @MylesBorins

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Mar 11, 2020 •
edited by MylesBorins
Loading

CI: https://ci.nodejs.org/job/node-test-pull-request/29733/
retry linter: https://ci.nodejs.org/job/node-test-linter/33328/

@mcollina
Copy link
Member

+1 to fast track

@MylesBorins
Copy link
Contributor

@ronag FWIW this patch is not going to land cleanly on v13.x. You might want to get started on a backport now if you have time. very much trying to get this out in today's release.

@ronag ronag mentioned this pull request Mar 11, 2020
Closed
4 tasks
@MylesBorins
Copy link
Contributor

landed in f8f2089

MylesBorins pushed a commit that referenced this pull request Mar 11, 2020
@ronag @MylesBorins
stream: avoid destroying http1 objects
f8f2089 
http1 objects are coupled with their corresponding
res/req and cannot be treated independently as
normal streams. Add a special exception for this
in the pipeline cleanup.

Fixes: #32184

PR-URL: #32197
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
MylesBorins pushed a commit that referenced this pull request Mar 12, 2020
@ronag @MylesBorins
stream: avoid destroying http1 objects
66fe2d9 
http1 objects are coupled with their corresponding
res/req and cannot be treated independently as
normal streams. Add a special exception for this
in the pipeline cleanup.

Fixes: #32184

Backport-PR-URL: #32212
PR-URL: #32197
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
@MylesBorins MylesBorins mentioned this pull request Mar 12, 2020
Merged
@ronag ronag mentioned this pull request Apr 20, 2020
Closed
4 tasks
@mafintosh mafintosh mentioned this pull request Apr 20, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BridgeAR BridgeAR BridgeAR left review comments

@addaleax addaleax addaleax approved these changes

@mcollina mcollina mcollina approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. 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.

Regression: socket hang up when uploading and streaming with pipeline
7 participants
@ronag @nodejs-github-bot @mcollina @MylesBorins @addaleax @BridgeAR @targos