tls: make StreamWrap work correctly when waiting for "drain" events in doShutdown #23294
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mscdex
reviewed
Oct 6, 2018
addaleax
approved these changes
Oct 6, 2018
Member
addaleax
left a comment
There was a problem hiding this comment.
The following test will fail before this commit.
Is there a way to reach this error through public API? If so, can we use that for the test?
lib/internal/wrap_js_stream.js
Outdated
| @@ -114,7 +111,9 @@ class JSStreamWrap extends Socket { | ||
|
|
||
| if (this[kCurrentWriteRequest] !== null) | ||
| return this.on('drain', () => this.doShutdown(req)); | ||
| assert.strictEqual(this[kCurrentWriteRequest], null); |
Member
There was a problem hiding this comment.
This assertion can stay, right? Or is it “too obvious” that it’s true?
Contributor
Author
There was a problem hiding this comment.
You are right. We can't be too careful here.
lib/internal/wrap_js_stream.js
Outdated
| @@ -114,7 +111,9 @@ class JSStreamWrap extends Socket { | ||
|
|
||
| if (this[kCurrentWriteRequest] !== null) | ||
| return this.on('drain', () => this.doShutdown(req)); |
Member
There was a problem hiding this comment.
Aside: This should be .once(), I think?
Contributor
Author
|
I reached this error when I tried to use In fact, I can't produce this through public API as As the situations that would reach this line of code seem to be rare, removing the listener to |
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit.
Contributor
Author
|
The travis ci is green now. I didn't notice the |
Member
danbev
approved these changes
Oct 12, 2018
Contributor
|
Landed in e4dea40. |
danbev
pushed a commit
that referenced
this pull request
Oct 12, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Trott
pushed a commit
that referenced
this pull request
Oct 13, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
targos
pushed a commit
that referenced
this pull request
Oct 13, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
jasnell
pushed a commit
that referenced
this pull request
Oct 17, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Oct 30, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Closed
rvagg
pushed a commit
that referenced
this pull request
Nov 28, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 29, 2018
When an instance of StreamWrap is shutting down and a "drain" event is emitted, the instance will abort as its `this[kCurrentShutdownRequest]` is already set. The following test will fail before this commit. PR-URL: #23294 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When an instance of
StreamWrapis shutting down and a "drain" event is emitted, the process will abort as itsthis[kCurrentShutdownRequest]is already set bydoShutdownitself.The following test will fail before this commit.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes