http2: invoke connect callback immediately if session was connected #19842

pietermees · 2018-04-05T22:45:18Z

Resolves #19839

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

lpinca · 2018-04-06T06:58:09Z

Is it possible to add a test?

BridgeAR · 2018-04-06T09:51:52Z

@pietermees as @lpinca pointed out, it would be great if you could add a test. There is a documentation for how to write tests in doc/guides/writing-tests.md. If you need any further help, please let me know and I am happy to help you out. In general: tests here in Node.js are pretty much written as if you would write a own application besides having some Node.js specific helper functions available.

BridgeAR · 2018-04-06T09:53:02Z

@pietermees and thanks a lot for contributing! Great that you went ahead to fix the issue right away 🎉.

apapirovski

There are some changes that need to be made before this lands. A test should definitely be added as it would help the suggested changes below, plus any other potential issues.

apapirovski · 2018-04-06T10:39:38Z

lib/internal/http2/core.js

+    if (session.connecting)
+      session.once('connect', listener);
+    else
+      listener.call(this, socket);


The context passed to the listener should be session rather than this from the current scope. Also, please use Reflect.apply(listener, session, [socket]); for user-provided callbacks.

fixed in 1fee57b30601f351c5b8eb60d2797917c0604a6b

pietermees · 2018-04-06T21:43:42Z

In d575ac7a49ca38f84fcd20f4ef0a01786e3e0f23 I added documentation for the connecting property. Is this something we want to do, and if so, did I do it correctly?

pietermees · 2018-04-06T21:43:48Z

And I'll add a test :)

BridgeAR

Just the comment about the version.

BridgeAR · 2018-04-08T17:26:33Z

doc/api/http2.md

@@ -320,6 +320,17 @@ added: v9.4.0
 Will be `true` if this `Http2Session` instance has been closed, otherwise
 `false`.

+#### http2session.connecting
+<!-- YAML
+added: v9.12.0


This should not be a fixed value. Instead of v9.12.0 just put in: REPLACEME. This is going to be automatically be replaced during publishing a new release.

Fixed in 8316d4f36b769fdf3224b65fdd32f4194a441ada

BridgeAR · 2018-04-08T17:28:22Z

doc/api/http2.md

+added: v9.12.0
+-->
+
+* Value: {boolean}


Just a hint: the Value will probably be removed soon. See #19869. If that lands before this PR, this should get a update and vice versa.

Update: it just landed and now the Value should be removed ;-)

It seems this is a new section, so no conflicts for now, but the * Value: {boolean} should b replaced with just * {boolean}.

Fixed in 8316d4f36b769fdf3224b65fdd32f4194a441ada

apapirovski · 2018-04-09T10:47:47Z

lib/internal/http2/core.js

+    if (session.connecting)
+      session.once('connect', listener);
+    else
+      Reflect.apply(listener, session, [socket]);


@jasnell @mcollina Thinking about this a bit more, should we use process.nextTick and emit a connect event regardless rather than directly calling the listener? I know we don't recommend this code pattern anywhere but something like the following would still not work after this change:

const session = http2.connect(SERVER_URL, { createConnection: () => socket }); session.once('connect', listener);

@apapirovski I think we should copy-paste what we are doing for http, https, net and tls. So, we should adhere to the prevailing pattern.

I'm good with emitting on nextTick

We actually do emit connect though on the following lines:

node/lib/internal/http2/core.js

Line 777 in e37effe

this.emit('connect', this, socket);

node/lib/internal/http2/core.js

Line 819 in e37effe

this.emit('connect', this, socket);

So I guess we're saying that we'll register the listener as a connect listener and change the two emits to run on the next tick?

See f21670f5d51d451cd2f2203f14d0f804ba107905

pietermees · 2018-04-09T19:16:53Z

@BridgeAR @apapirovski @jasnell updated to emit connect on next tick and added a test

…d socket

pietermees · 2018-04-09T19:21:28Z

streamlined the commits

mcollina

LGTM

mcollina · 2018-04-10T12:12:40Z

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

pietermees · 2018-04-10T19:09:47Z

@mcollina the CI error seems to be that test-tls-buffersize.js was still running when tests finished on debian8-x86. Doesn't sound related?

mcollina · 2018-04-10T19:12:21Z

That's probably flaky. We can land this.

For the flaky test, open an issue with the output of the failure if you can :).

cjihrig · 2018-04-10T19:16:10Z

No need to open a new issue. See #19903

pietermees · 2018-04-10T19:18:28Z

@cjihrig sure that's the same issue? The tests seem to succeed, but the process keeps running:

08:24:44 # Clean up any leftover processes, error if found.
08:24:44 ps awwx | grep Release/node | grep -v grep | cat
08:24:44  3155 pts/0    Rl+    0:00 out/Release/node /home/iojs/debug-18998/test/parallel/test-tls-buffersize.js

See https://ci.nodejs.org/job/node-test-commit-linux/17820/nodes=debian8-x86/console

mcollina · 2018-04-10T19:21:47Z

@apapirovski are you ok for this to land?

cjihrig · 2018-04-10T19:22:50Z

/home/iojs/debug-18998

I'm guessing the two are related. #18998 was closed in favor of #19903. That may be left over from @addaleax's debugging session?

addaleax · 2018-04-10T19:26:53Z

@cjihrig Yup, exactly. I’m sorry for the inconvenience, I think this was worth it though…

apapirovski · 2018-04-10T19:36:19Z

Thanks for making the changes @pietermees — sorry for the back-and-forth. I think this should be ready to land.

mcollina · 2018-04-11T06:58:28Z

Landed in 4ac7753...2852521

PR-URL: #19842 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

PR-URL: nodejs#19842 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

Backport-PR-URL: #20456 PR-URL: #19842 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

grantila · 2020-08-20T22:08:07Z

This seems to till be an issue in Node 12. I have it working on 10 and 14, but it doesn't work for me in 12.

I'm digging through Node.js code to see what could potentially cause 12 to really break when 10 and 14 works, and I find weird things, undocumented. What is this (on master):

node/lib/_tls_wrap.js

Lines 1570 to 1571 in 2e6c3e2

    
           if (!options.keepAlive) 
        
             options.singleUse = true;

These two options, keepAlive and singleUse aren't documented, meaning, if I happen to have them in my options object for some reason (I don't, just saying), what will that cause? Not sure it's related though.

grantila · 2020-08-20T22:54:04Z

Never mind, this is fixed by #33343

nodejs-github-bot added dont-land-on-v4.x http2 Issues or PRs related to the http2 subsystem. labels Apr 5, 2018

pietermees changed the title ~~Invoke http2.connect callback immediately if the Http2Session was connected synchronously~~ http2: invoke connect callback immediately if session was connected Apr 5, 2018

jasnell approved these changes Apr 5, 2018

View reviewed changes

apapirovski reviewed Apr 6, 2018

View reviewed changes

BridgeAR reviewed Apr 8, 2018

View reviewed changes

apapirovski reviewed Apr 9, 2018

View reviewed changes

pietermees force-pushed the fix/http2-connect-cb branch from 6998ae8 to 27171ce Compare April 9, 2018 19:15

pietermees added 3 commits April 9, 2018 15:19

doc: add Http2Session.connecting property

e785e66

http2: emit session connect on next tick

29036ab

test: add test for http2 session connect callback on already connecte…

e9f09bd

…d socket

pietermees force-pushed the fix/http2-connect-cb branch from 27171ce to e9f09bd Compare April 9, 2018 19:21

mcollina approved these changes Apr 10, 2018

View reviewed changes

addaleax approved these changes Apr 10, 2018

View reviewed changes

apapirovski approved these changes Apr 10, 2018

View reviewed changes

apapirovski added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 10, 2018

mcollina closed this Apr 11, 2018

apapirovski mentioned this pull request Apr 11, 2018

http2.connect callback not called if createConnection returns a socket that's already connected #19839

Closed

pietermees deleted the fix/http2-connect-cb branch April 11, 2018 21:32

pietermees mentioned this pull request Apr 28, 2018

Fix synchronous session connection grantila/fetch-h2#15

Closed

MylesBorins mentioned this pull request May 2, 2018

v8.11.2 proposal #20478

Merged

http2: invoke connect callback immediately if session was connected #19842

http2: invoke connect callback immediately if session was connected #19842

Conversation

pietermees commented Apr 5, 2018 • edited Loading

Checklist

lpinca commented Apr 6, 2018

BridgeAR commented Apr 6, 2018

BridgeAR commented Apr 6, 2018

apapirovski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pietermees commented Apr 6, 2018

pietermees commented Apr 6, 2018

BridgeAR left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

apapirovski Apr 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pietermees commented Apr 9, 2018

pietermees commented Apr 9, 2018

mcollina left a comment

Choose a reason for hiding this comment

mcollina commented Apr 10, 2018

pietermees commented Apr 10, 2018

mcollina commented Apr 10, 2018

cjihrig commented Apr 10, 2018

pietermees commented Apr 10, 2018

mcollina commented Apr 10, 2018

cjihrig commented Apr 10, 2018

addaleax commented Apr 10, 2018

apapirovski commented Apr 10, 2018

mcollina commented Apr 11, 2018

grantila commented Aug 20, 2020

grantila commented Aug 20, 2020

pietermees commented Apr 5, 2018 •

edited

Loading

apapirovski Apr 9, 2018 •

edited

Loading