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

micooz · 2017-08-24T08:08:06Z

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

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

mscdex · 2017-08-24T08:43:16Z

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

/cc @indutny ?

jasnell · 2017-08-24T15:22:27Z

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

indutny · 2017-08-24T17:21:40Z

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 · 2017-08-31T16:10:37Z

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

BridgeAR · 2017-09-13T19:03:26Z

Ping @indutny

BridgeAR · 2017-09-19T21:08:42Z

Ping @nodejs/crypto @mcollina

mcollina · 2017-09-19T21:12:42Z

I cannot help but I trust @indutny.

BridgeAR · 2017-09-24T15:42:55Z

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

indutny · 2017-09-24T17:34:00Z

@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 · 2017-09-24T18:22:24Z

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 · 2017-09-24T18:32:54Z

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 · 2017-09-24T18:33:08Z

lib/net.js

@@ -767,7 +767,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {

  // 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)


This condition should be left as it is.

BridgeAR · 2017-10-02T00:12:59Z

Ping @micooz

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

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: #15791 Fixes: #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 · 2017-10-21T17:57:11Z

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!

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: #15791 Fixes: #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>

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#15791 Fixes: 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>

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#15791 Fixes: 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>

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#15791 Fixes: 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>

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: #15791 Fixes: #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>

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-bot added net Issues and PRs related to the net subsystem. tls Issues and PRs related to the tls subsystem. labels Aug 24, 2017

micooz mentioned this pull request Aug 24, 2017

TLSSocket.bufferSize is always +1 before and after write() #15005

Closed

jasnell requested a review from mcollina September 15, 2017 22:48

indutny reviewed Sep 24, 2017

View reviewed changes

apapirovski closed this Oct 21, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

micooz commented Aug 24, 2017

mscdex commented Aug 24, 2017 •

edited

Loading

jasnell commented Aug 24, 2017

indutny commented Aug 24, 2017

BridgeAR commented Aug 31, 2017

BridgeAR commented Sep 13, 2017

BridgeAR commented Sep 19, 2017

mcollina commented Sep 19, 2017

BridgeAR commented Sep 24, 2017 •

edited

Loading

indutny commented Sep 24, 2017

BridgeAR commented Sep 24, 2017

indutny commented Sep 24, 2017

indutny Sep 24, 2017

BridgeAR commented Oct 2, 2017

apapirovski commented Oct 21, 2017

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

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

Conversation

micooz commented Aug 24, 2017

Checklist

Affected core subsystem(s)

mscdex commented Aug 24, 2017 • edited Loading

jasnell commented Aug 24, 2017

indutny commented Aug 24, 2017

BridgeAR commented Aug 31, 2017

BridgeAR commented Sep 13, 2017

BridgeAR commented Sep 19, 2017

mcollina commented Sep 19, 2017

BridgeAR commented Sep 24, 2017 • edited Loading

indutny commented Sep 24, 2017

BridgeAR commented Sep 24, 2017

indutny commented Sep 24, 2017

indutny Sep 24, 2017

Choose a reason for hiding this comment

BridgeAR commented Oct 2, 2017

apapirovski commented Oct 21, 2017

mscdex commented Aug 24, 2017 •

edited

Loading

BridgeAR commented Sep 24, 2017 •

edited

Loading