Add port conflict exception #4565
Merged
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
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
…o add_port_conflict_exception
Signed-off-by: Gabriel Fukushima <[email protected]>
fab-10
requested changes
Oct 27, 2022
| return false; | ||
| } | ||
|
|
||
| public static void checkPortsAvailable(final int tcpPort) { |
There was a problem hiding this comment.
then method name says Ports so suggests that more than one port as parameter like a var arg, otherwise use the singular
There was a problem hiding this comment.
Changed the name of the method, thanks for raising that @fab-10
There was a problem hiding this comment.
Changed the approach to cover the ports we will require to initialise all the services defined in the config. So we can have a more general solution that loops through the ports and check if they are available.
Signed-off-by: Gabriel Fukushima <[email protected]>
jframe
previously requested changes
Oct 28, 2022
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java
Outdated
Show resolved
Hide resolved
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcService.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
fab-10
approved these changes
Oct 28, 2022
jframe
reviewed
Oct 31, 2022
| if (!unavailablePorts.isEmpty()) { | ||
| throw new InvalidConfigurationException( | ||
| "Port(s) '" | ||
| + unavailablePorts.toString() |
There was a problem hiding this comment.
nit: toString on unavailablePorts isn't necessary
| @@ -3126,6 +3127,25 @@ private void checkPortClash() { | |||
| }); | |||
| } | |||
|
|
|||
| private void checkIfRequiredPortsAreAvailable() { | |||
| List<Integer> unavailablePorts = new ArrayList<>(); | |||
| @@ -219,6 +219,7 @@ public CompletableFuture<?> start() { | |||
|
|
|||
| final CompletableFuture<?> resultFuture = new CompletableFuture<>(); | |||
| try { | |||
|
|
|||
There was a problem hiding this comment.
any reason to add the extra empty line?
util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java
Outdated
Show resolved
Hide resolved
jframe
dismissed
their stale review
changes have been made to check port conflicts for other services
siladu
reviewed
Oct 31, 2022
| @@ -98,4 +105,31 @@ public static void checkPort(final int port, final String portTypeName) { | |||
| "%s port requires a value between 1 and 65535. Got %d.", portTypeName, port)); | |||
| } | |||
| } | |||
|
|
|||
| public static boolean isPortAvailableForTcp(final int port) { | |||
siladu
reviewed
Oct 31, 2022
| return false; | ||
| } | ||
|
|
||
| public static boolean isPortAvailableForUdp(final int port) { |
jframe
reviewed
Oct 31, 2022
util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
Signed-off-by: Gabriel Fukushima <[email protected]>
jframe
approved these changes
Nov 2, 2022
| return false; | ||
| } | ||
|
|
||
| public static boolean isPortAvailable(final int port) { |
There was a problem hiding this comment.
nit: consider renaming to make to clear this is checking both udp and tcp. maybe rename to isPortAvailableForTcpAndUdp
macfarla
pushed a commit
to jflo/besu
that referenced
this pull request
Jan 10, 2023
Signed-off-by: Gabriel Fukushima <[email protected]> Signed-off-by: Sally MacFarlane <[email protected]>
eum602
pushed a commit
to lacchain/besu
that referenced
this pull request
Nov 3, 2023
Signed-off-by: Gabriel Fukushima <[email protected]>
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.
PR description
Added methods to check if port is available and call before starting websockets and rpc services.
Fixed Issue(s)
Fixes #4176
Documentation
doc-change-requiredlabel to this PR ifupdates are required.
Changelog