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

http: detach socket from IncomingMessage on keep-alive #32153

Closed
wants to merge 1 commit into from
Closed

http: detach socket from IncomingMessage on keep-alive #32153

wants to merge 1 commit into from

Conversation

ronag
Copy link
Member

@ronag ronag commented Mar 8, 2020

If the socket is not detached then a future call to res.destroy
(through e.g. pipeline) would unecessarily kill the socket while
its in the agent free list.

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 http Issues or PRs related to the http subsystem. label Mar 8, 2020
@ronag
Copy link
Member Author

ronag commented Mar 8, 2020

@szmarczak I think this is the fix you were looking for.

@ronag ronag added the semver-major PRs that contain breaking changes and should be released in the next major version. label Mar 8, 2020
@ronag
Copy link
Member Author

ronag commented Mar 8, 2020

I'm not sure whether setting socket to null here can cause more breakage... but it does make sense to set it to null. Also given the quote above IncomingMessage.destroy

// It's possible that the socket will be destroyed, and removed from
// any messages, before ever calling this.  In that case, just skip
// it, since something else is destroying this connection anyway.

@ronag ronag mentioned this pull request Mar 8, 2020
Closed
4 tasks
@szmarczak
Copy link
Member

Looks amazing, you're a lifesaver!

@szmarczak szmarczak mentioned this pull request Mar 8, 2020
Closed
2 tasks
@ronag
http: detach socket from IncomingMessage on keep-alive
30601b5 
If the socket is not detached then a future call to res.destroy
(through e.g. pipeline) would unecessarily kill the socket while
its in the agent free list.
@ronag ronag changed the title stream: detach socket from IncomingMessage on keep-alive http: detach socket from IncomingMessage on keep-alive Mar 8, 2020
@addaleax
Copy link
Member

addaleax commented Mar 9, 2020

CITGM: https://ci.nodejs.org/view/Node.js-citgm/job/citgm-smoker/2296/

@nodejs-github-bot
Copy link
Collaborator

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

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Mar 9, 2020
@ronag
Copy link
Member Author

ronag commented Mar 10, 2020

CITGM looks good

ronag added a commit that referenced this pull request Mar 10, 2020
@ronag
http: detach socket from IncomingMessage on keep-alive
c1b2f6a 
If the socket is not detached then a future call to res.destroy
(through e.g. pipeline) would unecessarily kill the socket while
its in the agent free list.

PR-URL: #32153
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@ronag
Copy link
Member Author

ronag commented Mar 10, 2020

Landed in c1b2f6a

@ronag ronag closed this Mar 10, 2020
@szmarczak
Copy link
Member

Since this isn't a breaking change, will this be backported?

@ronag
Copy link
Member Author

ronag commented Mar 11, 2020

@szmarczak it's labeled as semver-major, sorry :(

@szmarczak szmarczak mentioned this pull request Mar 11, 2020
Closed
@BethGriggs BethGriggs mentioned this pull request Mar 17, 2020
Merged
@szmarczak szmarczak mentioned this pull request Apr 28, 2020
Closed
hyj1991 added a commit to hyj1991/urllib that referenced this pull request May 14, 2020
@hyj1991
fix: res.socket is null in node-v14.x
85ae99b 
res.socket has been detached from IncomingMessage in node-v14.x

Reference: nodejs/node#32153
@hyj1991 hyj1991 mentioned this pull request May 14, 2020
Merged
hyj1991 added a commit to hyj1991/urllib that referenced this pull request May 14, 2020
@hyj1991
fix: res.socket is null in node-v14.x
9552eee 
res.socket has been detached from IncomingMessage in node-v14.x

Reference: nodejs/node#32153
fengmk2 pushed a commit to node-modules/urllib that referenced this pull request May 15, 2020
@hyj1991
fix: res.socket is null in node-v14.x (#339)
175ad2b 
res.socket has been detached from IncomingMessage in node-v14.x

Reference: nodejs/node#32153
Jimbly
Jimbly reviewed Jan 1, 2021
View reviewed changes
test/parallel/test-http-agent-destroyed-socket.js
@@ -48,7 +48,7 @@ const server = http.createServer(common.mustCall((req, res) => {
response.on('end', common.mustCall(() => {
request1.socket.destroy();

response.socket.once('close', common.mustCall(() => {
request1.socket.once('close', common.mustCall(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like it's no longer testing what it used to be testing (just working around the fact that response.socket is cleared now by attaching the event to an unrelated socket?). Proper fix would be to leave the event on response.socket and just attach it before the socket is cleared (up 3 lines, right after response.pipe)?

I'm not actually familiar with this code, just in here since this test started breaking on Node v14 over in http-parser-js, which has a fork of some of these tests, but I noticed the old code also had a big comment about how important the timing/ordering of attaching that event listener was.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jimbly Jimbly Jimbly left review comments

@szmarczak szmarczak szmarczak approved these changes

@addaleax addaleax addaleax approved these changes

@jasnell jasnell jasnell 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. http Issues or PRs related to the http subsystem. semver-major PRs that contain breaking changes and should be released in the next major version.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ronag @szmarczak @addaleax @nodejs-github-bot @jasnell @Jimbly @BridgeAR