http2: simplify subsequent rstStream calls #16753
Closed
Conversation
This file contains 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
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour.
apapirovski
added
http2
nodejs-github-bot
added
dont-land-on-v4.x
http2
apapirovski
commented
Nov 4, 2017
| // skip straight to destroy | ||
| stream.destroy(); | ||
| // rst has already been called by self or peer, | ||
| // do not call again |
There was a problem hiding this comment.
Also to expand on what this says, we can't throw here because it's possible we received an RST frame from the remote peer and are getting ready to destroy but have not done that yet, so the user code calls rstStream in the meantime — that's where it should just gracefully exit rather than throw.
There was a problem hiding this comment.
Can you assert(stream.destroyed); here instead? If I understand correctly, that should always be true?
There was a problem hiding this comment.
Not necessarily since the destruction gets scheduled using setImmediate or process.nextTick. (Also when stream.destroyed then this function will throw further up above.)
addaleax
approved these changes
Nov 4, 2017
| // skip straight to destroy | ||
| stream.destroy(); | ||
| // rst has already been called by self or peer, | ||
| // do not call again |
There was a problem hiding this comment.
Can you assert(stream.destroyed); here instead? If I understand correctly, that should always be true?
|
Landed in 795a964 |
apapirovski
added a commit
that referenced
this pull request
Nov 7, 2017
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour. PR-URL: #16753 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
3 tasks
evanlucas
pushed a commit
that referenced
this pull request
Nov 13, 2017
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour. PR-URL: #16753 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Dec 7, 2017
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour. PR-URL: #16753 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Dec 8, 2017
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour. PR-URL: #16753 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Do not call destroy each time rstStream is called since the first call (or receipt of rst frame) will always trigger destroy. Expand existing test for this behaviour.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
http2, test