cluster: fix inspector port assignment #18696
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
nodejs-github-bot
added
the
cluster
ChALkeR
reviewed
Feb 10, 2018
lib/internal/cluster/master.js
Outdated
| @@ -119,6 +119,9 @@ function createWorkerProcess(id, env) { | |||
| } | |||
| } else { | |||
| inspectPort = process.debugPort + debugPortOffset; | |||
| const offset = inspectPort - 65535; | |||
| if (offset > 0) | |||
| inspectPort = 1023 + offset; | |||
There was a problem hiding this comment.
I would have written this as:
const [minPort, maxPort] = [1024, 65535];
…
if (inspectPort > maxPort)
inspectPort = inpectPort - maxPort + minPort - 1;Not sure if others agree with me, though, so lets wait for further comments ;-)
There was a problem hiding this comment.
@ChALkeR looks a little bit more readable :)
|
@santigimeno hi! You have a little typo in the title "inpector" -> "inspector" |
tniessen
changed the title
cjihrig
approved these changes
Feb 13, 2018
| assert.strictEqual(ports[0] + 1, ports[1]); | ||
| assert.strictEqual(ports[1] + 1, ports[2]); | ||
| assert.strictEqual(ports[2] + 1, ports[3]); | ||
| ports.forEach((port, i) => { |
There was a problem hiding this comment.
I think I'd prefer to keep the existing assertion style instead of using a forEach(). It's much more readable IMO.
santigimeno
force-pushed
the
fix_inspector_port_cluster
branch
from
6ce83ac
to
1af082e
Compare
Make sure that inspector ports in cluster are inside the valid range: `[1024, 65535]`. Fix flaky `test-inspector-port-zero-cluster`. Fixes: nodejs#18303
santigimeno
force-pushed
the
fix_inspector_port_cluster
branch
from
1af082e
to
efdea32
Compare
|
Comments addressed. CI: https://ci.nodejs.org/job/node-test-pull-request/13249/ |
BridgeAR
approved these changes
Feb 18, 2018
BridgeAR
added
the
author ready
|
Landed in 45982de 🎉 |
BridgeAR
pushed a commit
to BridgeAR/node
that referenced
this pull request
Feb 22, 2018
Make sure that inspector ports in cluster are inside the valid range: `[1024, 65535]`. Fixes flaky `test-inspector-port-zero-cluster`. PR-URL: nodejs#18696 Fixes: nodejs#18303 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
addaleax
pushed a commit
to addaleax/node
that referenced
this pull request
Feb 26, 2018
Make sure that inspector ports in cluster are inside the valid range: `[1024, 65535]`. Fixes flaky `test-inspector-port-zero-cluster`. PR-URL: nodejs#18696 Fixes: nodejs#18303 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Closed
Merged
MayaLekova
pushed a commit
to MayaLekova/node
that referenced
this pull request
May 8, 2018
Make sure that inspector ports in cluster are inside the valid range: `[1024, 65535]`. Fixes flaky `test-inspector-port-zero-cluster`. PR-URL: nodejs#18696 Fixes: nodejs#18303 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
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.
Make sure that inspector ports in cluster are inside the valid range:
[1024, 65535].Fix flaky
test-inspector-port-zero-cluster.Fixes: #18303
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)