net: set default highwatermark at socket creation time #48882
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
|
Review requested:
|
nodejs-github-bot
added
needs-ci
lukiano
commented
Jul 22, 2023
lib/net.js
Outdated
| @@ -1735,11 +1735,8 @@ function Server(options, connectionListener) { | |||
| if (typeof options.highWaterMark !== 'undefined') { | |||
| validateNumber( | |||
| options.highWaterMark, 'options.highWaterMark', | |||
| 0 | |||
There was a problem hiding this comment.
I'm throwing an error if options.highWaterMark is less than zero. Alternatively, we can fallback to a default value of undefined.
There was a problem hiding this comment.
I'm okay with being more strict and forbid negative values.
lukiano
commented
Jul 22, 2023
lib/net.js
Outdated
| @@ -1755,7 +1752,7 @@ function Server(options, connectionListener) { | |||
| this.noDelay = Boolean(options.noDelay); | |||
| this.keepAlive = Boolean(options.keepAlive); | |||
| this.keepAliveInitialDelay = ~~(options.keepAliveInitialDelay / 1000); | |||
| this.highWaterMark = options.highWaterMark ?? getDefaultHighWaterMark(); | |||
| this.highWaterMark = options.highWaterMark ?? undefined; | |||
There was a problem hiding this comment.
Theoretically this.highWaterMark = options.highWaterMark; should suffice if we are happy with falsy values.
There was a problem hiding this comment.
Yes, let's accept falsy values.
|
Can you also please fix linter issues? |
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
a6dc57b to
d6e7851
Compare
|
LGTM now. |
|
Tests are failing |
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
d6e7851 to
624f697
Compare
|
I've amended the tests. |
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
624f697 to
b0572e0
Compare
|
I've also made the procedure more evident in the documentation. |
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
b0572e0 to
9f859b9
Compare
|
Fixed some linting issues. |
lpinca
added
the
semver-major
lpinca
approved these changes
Jul 27, 2023
doc/api/http.md
Outdated
| @@ -3249,7 +3249,7 @@ changes: | |||
| * `highWaterMark` {number} Optionally overrides all `socket`s' | |||
| `readableHighWaterMark` and `writableHighWaterMark`. This affects | |||
| `highWaterMark` property of both `IncomingMessage` and `ServerResponse`. | |||
| **Default:** See [`stream.getDefaultHighWaterMark()`][]. | |||
| **Default:** `undefined`. Sockets will use the default watermark value at the time the request arrives. See [`stream.getDefaultHighWaterMark()`][]. | |||
There was a problem hiding this comment.
I would keep it consistent and add a line break after 80 characters.
There was a problem hiding this comment.
The lint job fails for this reason.
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
9f859b9 to
18696df
Compare
github-actions
bot
removed
the
request-ci
This was referenced Jul 29, 2023
github-actions
bot
removed
the
request-ci
29 tasks
|
This needs a rebase to fix the git conflicts. |
lukiano
force-pushed
the
fix/watermark-at-socket-creation
branch
from
18696df to
3a500ba
Compare
|
Thanks. Rebased |
github-actions
bot
removed
the
request-ci
This was referenced Oct 1, 2023
jasnell
approved these changes
Oct 28, 2023
github-actions
bot
removed
the
request-ci
This was referenced Oct 31, 2023
This was referenced Nov 12, 2023
github-actions
bot
removed
the
request-ci
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.
This PR is to make a recent code changes backwards compatible with previous releases of Node.JS, as depicted in #47405 (comment)