[v6.x backport] tls: fix writeQueueSize prop, long write timeouts#16420
Uh oh!
There was an error while loading. Please reload this page.
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
apapirovski added net 
nodejs-github-bot added build apapirovski removed build 
Contributor
MylesBorins commented Oct 23, 2017
@apapirovski a bit confused... doesn't seem like I requested this backport in the issue. Did we cross wires? |
ContributorAuthor
@MylesBorins You did in our conversation earlier. The name of the issue might just be a tad confusing. See #13391 Either way, even if you hadn't, this should be back-ported given that it's a serious bug. But if you don't want this back-ported for v4.x let me know as I'm almost done. |
Contributor
MylesBorins commented Oct 23, 2017
@apapirovski AHHHHHH... thanks This is slated to land in 8.8.0. Which means that we can likely land it in the following 6.x release, and a future 4.x maintenance release (assuming we get signoff on the backport) |
apapirovski added c++ 
refack approved these changes Oct 24, 2017
ContributorAuthor
apapirovski commented Oct 24, 2017
MylesBorinsforce-pushed the v6.x-staging branch from 54286db to 3e96c85Compareapapirovskiforce-pushed the backport-15791-to-v6.x branch from b6ed49b to 7feac5cCompareContributorAuthor
apapirovski commented Oct 25, 2017
CI is all green (failure unrelated) and I've rebased. |
ContributorAuthor
apapirovski commented Oct 25, 2017
This is blocked because of #16484 — working on a PR which will then need to be applied here. |
ContributorAuthor
apapirovski commented Oct 25, 2017
Last commit is technically from a different PR but this shouldn't land without it. |
MylesBorinsforce-pushed the v6.x-staging branch from 9219283 to b0fadbeCompare
Member
mcollina commented Oct 26, 2017
I think this should wait for some more time before backporting (if at all). |
mcollina added the baking-for-lts MylesBorinsforce-pushed the v6.x-staging branch from fa922b9 to 50c3dabCompare
Make writeQueueSize represent the actual size of the write queue within the TLS socket. Add tls test to confirm that bufferSize works as expected. PR-URL: nodejs#15791Fixes: nodejs#15005 Refs: nodejs#15006 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
Add updateWriteQueueSize which updates and returns queue size (net & tls). Make _onTimeout check whether an active write is ongoing and if so, call _unrefTimer rather than emitting a timeout event. Add http & https test that checks whether long-lasting (but active) writes timeout or can finish writing as expected. PR-URL: nodejs#15791Fixes: nodejs#15082 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
This commit handles the case where _onTimeout is called with a null handle. Refs: nodejs#15791Fixes: nodejs#16484 PR-URL: nodejs#16489 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
apapirovskiforce-pushed the backport-15791-to-v6.x branch from 67ca82f to 920f2ffCompareContributor
MylesBorins commented Dec 19, 2017
@mcollina is this ready to land? |
Member
mcollina commented Dec 20, 2017
@MylesBorins no. This PR introduced #16484 which was fixed in #16489. |
ContributorAuthor
apapirovski commented Dec 20, 2017
@mcollina the commit from that second PR is in here |
MylesBorins pushed a commit that referenced this pull request Dec 20, 2017
Make writeQueueSize represent the actual size of the write queue within the TLS socket. Add tls test to confirm that bufferSize works as expected. Backport-PR-URL: #16420 PR-URL: #15791Fixes: #15005 Refs: #15006 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
MylesBorins pushed a commit that referenced this pull request Dec 20, 2017
Add updateWriteQueueSize which updates and returns queue size (net & tls). Make _onTimeout check whether an active write is ongoing and if so, call _unrefTimer rather than emitting a timeout event. Add http & https test that checks whether long-lasting (but active) writes timeout or can finish writing as expected. Backport-PR-URL: #16420 PR-URL: #15791Fixes: #15082 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
MylesBorins pushed a commit that referenced this pull request Dec 20, 2017
This commit handles the case where _onTimeout is called with a null handle. Backport-PR-URL: #16420 Refs: #15791Fixes: #16484 PR-URL: #16489 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
Contributor
MylesBorins commented Dec 20, 2017
landed in 612baca...15d855d |
MylesBorins pushed a commit that referenced this pull request Jan 2, 2018
Make writeQueueSize represent the actual size of the write queue within the TLS socket. Add tls test to confirm that bufferSize works as expected. Backport-PR-URL: #16420 PR-URL: #15791Fixes: #15005 Refs: #15006 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 2, 2018
Add updateWriteQueueSize which updates and returns queue size (net & tls). Make _onTimeout check whether an active write is ongoing and if so, call _unrefTimer rather than emitting a timeout event. Add http & https test that checks whether long-lasting (but active) writes timeout or can finish writing as expected. Backport-PR-URL: #16420 PR-URL: #15791Fixes: #15082 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Fedor Indutny <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 2, 2018
This commit handles the case where _onTimeout is called with a null handle. Backport-PR-URL: #16420 Refs: #15791Fixes: #16484 PR-URL: #16489 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
MylesBorins removed the baking-for-lts This was referenced May 13, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
5 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.
This is a backport of #15791 as requested.
/cc @MylesBorins
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
net, tls, test