Skip to content

net,tls,test: remove writeQueueSize and fix bufferSize - #15006

Closed
micooz wants to merge 1 commit into
nodejs:masterfrom
micooz:master
Closed

net,tls,test: remove writeQueueSize and fix bufferSize#15006
micooz wants to merge 1 commit into
nodejs:masterfrom
micooz:master

Conversation

@micooz

@micoozmicooz commented Aug 24, 2017

Copy link
Copy Markdown

When use TLSSocket, bufferSize is always +1, this affects users who
rely on this property to make judgments. This commit removed legacy
code and corrected the calculation of bufferSize.

Fixes: #15005

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

net, tls, test

@micooz
net,tls,test: remove writeQueueSize and fix bufferSize
035bf88
When use TLSSocket, bufferSize is always +1, this affects users who
rely on this property to make judgments. This commit removed legacy
code and corrected the calculation of bufferSize.
Fixes: nodejs#15005
@nodejs-github-botnodejs-github-bot added net Issues and PRs related to the net subsystem. tls Issues and PRs related to the tls subsystem. labels Aug 24, 2017
@micoozmicooz mentioned this pull request Aug 24, 2017
Closed
@mscdex

mscdex commented Aug 24, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

/cc @indutny ?

@jasnell

jasnell commented Aug 24, 2017

Copy link
Copy Markdown
Member

hmm... would this end up being a semver-major?? It's really not clear.

@indutny

indutny commented Aug 24, 2017

Copy link
Copy Markdown
Member

I'm afraid this may not be a correct change. write_queue_size_string is used in src/ folder and this value is updated from C++ callbacks.

@BridgeAR

BridgeAR commented Aug 31, 2017

Copy link
Copy Markdown
Member

@indutny do you have a suggestion how to handle this properly?

@BridgeAR

BridgeAR commented Sep 13, 2017

Copy link
Copy Markdown
Member

Ping @indutny

@BridgeAR

BridgeAR commented Sep 19, 2017

Copy link
Copy Markdown
Member

Ping @nodejs/crypto @mcollina

@mcollina

mcollina commented Sep 19, 2017

Copy link
Copy Markdown
Member

I cannot help but I trust @indutny.

@BridgeAR

BridgeAR commented Sep 24, 2017•
edited
Loading

Copy link
Copy Markdown
Member

@indutny would you be so kind and give a hint how the correct approach would look like?

@indutny

indutny commented Sep 24, 2017

Copy link
Copy Markdown
Member

@BridgeAR sorry for delay. Technically it might be possible to keep the number of pending bytes in that property. Perhaps it should be approached in a way of fixing it rather than removing it?

@BridgeAR

BridgeAR commented Sep 24, 2017

Copy link
Copy Markdown
Member

As far as I see it the proper fix for the bufferSize would be to just removing the writeQueueSize from the return value but keep it in place otherwise as it was before. Do you agree @indutny?

@indutny

indutny commented Sep 24, 2017

Copy link
Copy Markdown
Member

Hm... on a second thought this might be a right way to do it indeed. Still the check if net.js is pretty important and should be left as it is.

indutny
indutny reviewed Sep 24, 2017
View reviewed changes
Comment threadlib/net.js

// If it was entirely flushed, we can write some more right now.
// However, if more is left in the queue, then wait until that clears.
if (req.async && this._handle.writeQueueSize !== 0)

@indutnyindutnySep 24, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This condition should be left as it is.

@BridgeAR

BridgeAR commented Oct 2, 2017

Copy link
Copy Markdown
Member

Ping @micooz

apapirovski added a commit to apapirovski/node that referenced this pull request Oct 18, 2017
@apapirovski
tls: properly track writeQueueSize during writes
4b94697
Make writeQueueSize represent the actual size of the write queue
within the TLS socket. Add tls test to confirm that bufferSize
works as expected.
Fixes: nodejs#15005
Refs: nodejs#15006
apapirovski added a commit that referenced this pull request Oct 21, 2017
@apapirovski
tls: properly track writeQueueSize during writes
aaf2a1c
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: #15791Fixes: #15005
Refs: #15006
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
@apapirovski

apapirovski commented Oct 21, 2017

Copy link
Copy Markdown
Contributor

Thank you for trying to improve Node @micooz — since a fix for this landed in #15791 I'm going to close this PR but hope to see you around & contributing to Node!

MylesBorins pushed a commit that referenced this pull request Oct 23, 2017
@apapirovski@MylesBorins
tls: properly track writeQueueSize during writes
eeef06a
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: #15791Fixes: #15005
Refs: #15006
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
apapirovski added a commit to apapirovski/node that referenced this pull request Oct 25, 2017
@apapirovski
tls: properly track writeQueueSize during writes
008843d
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 <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
addaleax pushed a commit to ayojs/ayo that referenced this pull request Oct 26, 2017
@apapirovski@addaleax
tls: properly track writeQueueSize during writes
2635efd
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/node#15791Fixes: nodejs/node#15005
Refs: nodejs/node#15006
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
addaleax pushed a commit to ayojs/ayo that referenced this pull request Dec 7, 2017
@apapirovski@addaleax
tls: properly track writeQueueSize during writes
f47398d
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/node#15791Fixes: nodejs/node#15005
Refs: nodejs/node#15006
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
apapirovski added a commit to apapirovski/node that referenced this pull request Dec 12, 2017
@apapirovski
tls: properly track writeQueueSize during writes
7533f59
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 <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
MylesBorins pushed a commit that referenced this pull request Dec 20, 2017
@apapirovski@MylesBorins
tls: properly track writeQueueSize during writes
f588355
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 <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
MylesBorins pushed a commit that referenced this pull request Jan 2, 2018
@apapirovski@MylesBorins
tls: properly track writeQueueSize during writes
521dc25
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 <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mcollinamcollinaAwaiting requested review from mcollina
1 more reviewer
@indutnyindutnyindutny left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

netIssues and PRs related to the net subsystem.tlsIssues and PRs related to the tls subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@micooz@mscdex@jasnell@indutny@BridgeAR@mcollina@apapirovski@nodejs-github-bot