This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 3b8795b5ce IGNITE-20639 Remove portRange from network configuration
(#2716)
3b8795b5ce is described below
commit 3b8795b5ce5edd05ce79c26232f1e8684310060d
Author: Mikhail <[email protected]>
AuthorDate: Fri Nov 10 11:58:46 2023 +0300
IGNITE-20639 Remove portRange from network configuration (#2716)
---
examples/config/ignite-config.conf | 1 -
.../internal/rest/ItGeneratedRestClientTest.java | 1 -
.../resources/hardcoded-ports-config.json | 1 -
.../testframework/IntegrationTestBase.java | 1 -
.../configuration/NetworkConfigurationSchema.java | 5 ---
.../ignite/internal/network/netty/NettyServer.java | 36 ++++++----------------
.../raft/ItTruncateSuffixAndRestartTest.java | 1 -
.../configuration/generator/DefaultsGenerator.java | 2 +-
.../org/apache/ignite/internal/ssl/ItSslTest.java | 2 --
.../ignite-config-rest-port-not-default.json | 1 -
.../integrationTest/resources/ignite-config.json | 1 -
packaging/config/ignite-config.conf | 1 -
12 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/examples/config/ignite-config.conf
b/examples/config/ignite-config.conf
index 9da67a9bad..52b286d9ef 100644
--- a/examples/config/ignite-config.conf
+++ b/examples/config/ignite-config.conf
@@ -5,7 +5,6 @@ network {
]
}
port=3344
- portRange=10
}
nodeAttributes.nodeAttributes {
region.attribute = "US"
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
index 2e364f0a8b..8f3bf4fd27 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
@@ -133,7 +133,6 @@ public class ItGeneratedRestClientTest {
return "{\n"
+ " network: {\n"
+ " port: " + (BASE_PORT + nodeIdx) + ",\n"
- + " portRange: 1,\n"
+ " nodeFinder: {\n"
+ " netClusterNodes: [ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\" ] \n"
+ " }\n"
diff --git
a/modules/cli/src/integrationTest/resources/hardcoded-ports-config.json
b/modules/cli/src/integrationTest/resources/hardcoded-ports-config.json
index 5af4d412a9..9d9f388859 100644
--- a/modules/cli/src/integrationTest/resources/hardcoded-ports-config.json
+++ b/modules/cli/src/integrationTest/resources/hardcoded-ports-config.json
@@ -1,7 +1,6 @@
{
"network": {
"port": <NETWORK_PORT>,
- "portRange": 0,
"nodeFinder": {
"netClusterNodes": <NET_CLUSTER_NODES>
}
diff --git
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
index af828dafc4..0b1dd6ffab 100644
---
a/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
+++
b/modules/core/src/testFixtures/java/org/apache/ignite/internal/testframework/IntegrationTestBase.java
@@ -81,7 +81,6 @@ public class IntegrationTestBase extends
BaseIgniteAbstractTest {
private static final String NODE_BOOTSTRAP_CFG = "{\n"
+ " network: {\n"
+ " port:{},\n"
- + " portRange: 5,\n"
+ " nodeFinder:{\n"
+ " netClusterNodes: [ {} ]\n"
+ " }\n"
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
index 926d006156..a171672216 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
@@ -36,11 +36,6 @@ public class NetworkConfigurationSchema {
@Value(hasDefault = true)
public final int port = DEFAULT_PORT;
- /** Network port range. */
- @Range(min = 0)
- @Value(hasDefault = true)
- public final int portRange = 0;
-
/**
* Graceful shutdown of the Netty's EventExecutorGroup ensures that no
tasks are submitted for
* <i>'the quiet period'</i> before it shuts itself down. If a task is
submitted during the quiet period,
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
index 70c5f330e7..b912ffe9be 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/NettyServer.java
@@ -135,11 +135,18 @@ public class NettyServer {
});
int port = configuration.port();
- int portRange = configuration.portRange();
var bindFuture = new CompletableFuture<Channel>();
- tryBind(bootstrap, port, port + portRange, port, bindFuture);
+ bootstrap.bind(port).addListener((ChannelFuture future) -> {
+ if (future.isSuccess()) {
+ bindFuture.complete(future.channel());
+ } else if (future.isCancelled()) {
+ bindFuture.cancel(true);
+ } else {
+ bindFuture.completeExceptionally(new
IllegalStateException("Port " + port + " is not available."));
+ }
+ });
serverStartFuture = bindFuture
.handle((channel, err) -> {
@@ -165,31 +172,6 @@ public class NettyServer {
}
}
- /**
- * Try bind this server to a port.
- *
- * @param bootstrap Bootstrap.
- * @param port Target port.
- * @param endPort Last port that server can be bound to.
- * @param startPort Start port.
- * @param fut Future.
- */
- private void tryBind(ServerBootstrap bootstrap, int port, int endPort, int
startPort, CompletableFuture<Channel> fut) {
- if (port > endPort) {
- fut.completeExceptionally(new IllegalStateException("No available
port in range [" + startPort + "-" + endPort + ']'));
- }
-
- bootstrap.bind(port).addListener((ChannelFuture future) -> {
- if (future.isSuccess()) {
- fut.complete(future.channel());
- } else if (future.isCancelled()) {
- fut.cancel(true);
- } else {
- tryBind(bootstrap, port + 1, endPort, startPort, fut);
- }
- });
- }
-
/**
* Returns gets the local address of the server.
*
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
index 6e2aa3116c..39f2904713 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
@@ -118,7 +118,6 @@ public class ItTruncateSuffixAndRestartTest extends
BaseIgniteAbstractTest {
@BeforeEach
void setUp() {
CompletableFuture<Void> changeFuture = networkConfiguration.change(cfg
-> cfg
- .changePortRange(0)
.changeNodeFinder().changeNetClusterNodes(
range(port(0), port(NODES)).mapToObj(port ->
"localhost:" + port).toArray(String[]::new)
)
diff --git
a/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
b/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
index 0659a3ee38..0438336fa1 100644
---
a/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
+++
b/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
@@ -65,7 +65,7 @@ public class DefaultsGenerator {
changer.onDefaultsPersisted().get(5, TimeUnit.SECONDS);
} catch (Exception e) {
throw new IllegalStateException("Failed to generate defaults file."
- + "Please make sure that the classloader for loading
services is correct.");
+ + "Please make sure that the classloader for loading
services is correct.", e);
} finally {
if (changer != null) {
changer.stop();
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
index cfc9ba4fd1..444b7f8682 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
@@ -395,7 +395,6 @@ public class ItSslTest extends IgniteIntegrationTest {
+ " }\n"
+ " },\n"
+ " port: {},\n"
- + " portRange: 2,\n"
+ " nodeFinder:{\n"
+ " netClusterNodes: [ {}, \"localhost:3365\",
\"localhost:3366\" ]\n"
+ " }\n"
@@ -560,7 +559,6 @@ public class ItSslTest extends IgniteIntegrationTest {
+ " }\n"
+ " },\n"
+ " port: {},\n"
- + " portRange: 2,\n"
+ " nodeFinder:{\n"
+ " netClusterNodes: [ {}, \"localhost:3345\",
\"localhost:3346\" ]\n"
+ " }\n"
diff --git
a/modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json
b/modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json
index fdb059abbf..749a8a1b67 100644
---
a/modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json
+++
b/modules/runner/src/integrationTest/resources/ignite-config-rest-port-not-default.json
@@ -1,7 +1,6 @@
{
"network": {
"port": 3344,
- "portRange": 10,
"nodeFinder": {
"netClusterNodes": [
"localhost:3344"
diff --git a/modules/runner/src/integrationTest/resources/ignite-config.json
b/modules/runner/src/integrationTest/resources/ignite-config.json
index 8698d5af71..ff4ebef60e 100644
--- a/modules/runner/src/integrationTest/resources/ignite-config.json
+++ b/modules/runner/src/integrationTest/resources/ignite-config.json
@@ -1,7 +1,6 @@
{
"network": {
"port": 3344,
- "portRange": 10,
"nodeFinder": {
"netClusterNodes": [
"localhost:3344"
diff --git a/packaging/config/ignite-config.conf
b/packaging/config/ignite-config.conf
index be7adb998f..494f38a8ec 100644
--- a/packaging/config/ignite-config.conf
+++ b/packaging/config/ignite-config.conf
@@ -1,7 +1,6 @@
{
network: {
port: 3344,
- portRange: 10,
nodeFinder: {
netClusterNodes: [
"localhost:3344"
