This is an automated email from the ASF dual-hosted git repository.
apolovtsev 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 94e200bb6d4 IGNITE-28288 Revert "Use loopback IP address as listen
address in tests" (#7812)
94e200bb6d4 is described below
commit 94e200bb6d402d092d9532ce4a098a2cb0e1807a
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Wed Mar 18 12:57:34 2026 +0200
IGNITE-28288 Revert "Use loopback IP address as listen address in tests"
(#7812)
---
.../compaction/ItCatalogCompactionTest.java | 28 ++++++++++++----
...eryAfterCatalogTruncatedAboveStoredLwmTest.java | 30 ++++++++++++++----
.../org/apache/ignite/internal/NodeConfig.java | 2 --
.../management/topology/ItLogicalTopologyTest.java | 14 +++++---
.../PlatformCompatibilityTestNodeRunner.java | 21 +++++++++++-
.../internal/compute/ItExecutionsCleanerTest.java | 14 +++++---
.../ItDistributionZonesFiltersTest.java | 14 +++++---
.../rebalance/ItRebalanceTriggersRecoveryTest.java | 37 +++++++++++++++++-----
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 22 ++++++++++---
.../org/apache/ignite/internal/rest/RestNode.java | 1 -
.../internal/client/ItClientDirectMappingTest.java | 16 +++++++---
.../cluster/management/ItClusterInitTest.java | 1 -
.../management/ItDuplicateNodeNamesTest.java | 12 +++++--
.../ItNodeBootstrapConfigurationTest.java | 1 -
.../internal/runner/app/ItIgniteServerTest.java | 1 -
.../internal/runner/app/ItNoThreadsLeftTest.java | 1 -
.../runner/app/PlatformTestNodeRunner.java | 4 ---
.../app/client/ItAbstractThinClientTest.java | 1 -
.../client/ItThinClientChannelValidatorTest.java | 1 -
.../ignite/internal/app/IgniteServerStartTest.java | 1 -
.../ignite/internal/BaseIgniteRestartTest.java | 1 -
.../ignite/internal/ClusterConfiguration.java | 1 -
.../apache/ignite/internal/ConfigTemplates.java | 5 ++-
.../org/apache/ignite/internal/ssl/ItSslTest.java | 3 --
.../internal/sql/api/ItSqlCreateZoneTest.java | 26 +++++++++++----
.../sql/engine/ItUnstableTopologyTest.java | 18 ++++++++---
.../internal/sql/sqllogic/ItSqlLogicTest.java | 1 -
...ilablePartitionsRecoveryByFilterUpdateTest.java | 2 --
...lablePartitionsRecoveryWithNodeRestartTest.java | 35 ++++++++++++++++----
.../ItTransactionPrimaryChangeTest.java | 16 +++++++---
.../tx/distributed/ItTxResourcesVacuumTest.java | 16 +++++++---
31 files changed, 253 insertions(+), 93 deletions(-)
diff --git
a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
index 0fd5a3145cc..582ceeb98ad 100644
---
a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
+++
b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItCatalogCompactionTest.java
@@ -18,10 +18,10 @@
package org.apache.ignite.internal.catalog.compaction;
import static java.util.stream.Collectors.toUnmodifiableList;
-import static org.apache.ignite.internal.ConfigTemplates.DEFAULT_PROFILES;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_TEST_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
@@ -92,10 +92,26 @@ class ItCatalogCompactionTest extends
ClusterPerClassIntegrationTest {
@Override
protected String getNodeBootstrapConfigTemplate() {
- return renderConfigTemplate(
- DEFAULT_PROFILES
- + " storage.engines.aipersist.checkpoint.intervalMillis: " +
CHECK_POINT_INTERVAL_MS + ",\n"
- );
+ return "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " storage.profiles: {"
+ + " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ + " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ + " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine:
rocksdb"
+ + " },\n"
+ + " storage.engines: { "
+ + " aipersist: { checkpoint: { "
+ + " intervalMillis: " + CHECK_POINT_INTERVAL_MS
+ + " } } "
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
}
@Override
diff --git
a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest.java
b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest.java
index 3c980354185..8401eee9142 100644
---
a/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest.java
+++
b/modules/catalog-compaction/src/integrationTest/java/org/apache/ignite/internal/catalog/compaction/ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest.java
@@ -17,8 +17,10 @@
package org.apache.ignite.internal.catalog.compaction;
-import static org.apache.ignite.internal.ConfigTemplates.DEFAULT_PROFILES;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_TEST_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -46,10 +48,26 @@ class ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest
extends ClusterPerTe
@Override
protected String getNodeBootstrapConfigTemplate() {
- return renderConfigTemplate(
- DEFAULT_PROFILES
- + " storage.engines.aipersist.checkpoint.intervalMillis:
250,\n"
- );
+ return "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " storage.profiles: {"
+ + " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ + " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ + " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine:
rocksdb"
+ + " },\n"
+ + " storage.engines: { "
+ + " aipersist: { checkpoint: { "
+ + " intervalMillis: " + 250
+ + " } } "
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
}
@Override
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/NodeConfig.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/NodeConfig.java
index 2516ae15fbf..794e6477e73 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/NodeConfig.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/NodeConfig.java
@@ -46,7 +46,6 @@ public class NodeConfig {
public static String restSslBootstrapConfig(@Nullable String ciphers) {
return "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: {},\n"
+ " nodeFinder: {\n"
+ " netClusterNodes: [ {} ]\n"
@@ -85,7 +84,6 @@ public class NodeConfig {
public static String clientConnectorSslBootstrapConfig(@Nullable String
ciphers) {
return "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: {},\n"
+ " nodeFinder: {\n"
+ " netClusterNodes: [ {} ]\n"
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
index 947f9b80b53..57661230558 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
+++
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java
@@ -19,7 +19,6 @@ package
org.apache.ignite.internal.cluster.management.topology;
import static
org.apache.ignite.internal.ConfigTemplates.DISABLED_FAILURE_DETECTION_NODE_BOOTSTRAP_CFG_TEMPLATE;
import static
org.apache.ignite.internal.ConfigTemplates.FAST_FAILURE_DETECTION_NODE_BOOTSTRAP_CFG_TEMPLATE;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -69,10 +68,17 @@ class ItLogicalTopologyTest extends
ClusterPerTestIntegrationTest {
private static final String[] STORAGE_PROFILES_LIST = {"lru_rocks",
"segmented_aipersist"};
@Language("HOCON")
- private static final String
NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_NODE_ATTRIBUTES_AND_STORAGE_PROFILES =
renderConfigTemplate(
- " nodeAttributes.nodeAttributes: {region = US, storage = SSD},\n"
+ private static final String
NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_NODE_ATTRIBUTES_AND_STORAGE_PROFILES = "ignite
{\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " nodeAttributes.nodeAttributes: {region = US, storage =
SSD},\n"
+ " storage.profiles: {lru_rocks.engine = rocksdb,
segmented_aipersist.engine = aipersist},\n"
- );
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
private final LogicalTopologyEventListener listener = new
LogicalTopologyEventListener() {
@Override
diff --git
a/modules/compatibility-tests/src/testFixtures/java/org/apache/ignite/internal/PlatformCompatibilityTestNodeRunner.java
b/modules/compatibility-tests/src/testFixtures/java/org/apache/ignite/internal/PlatformCompatibilityTestNodeRunner.java
index cc2a43b3fe5..9b19fe29992 100644
---
a/modules/compatibility-tests/src/testFixtures/java/org/apache/ignite/internal/PlatformCompatibilityTestNodeRunner.java
+++
b/modules/compatibility-tests/src/testFixtures/java/org/apache/ignite/internal/PlatformCompatibilityTestNodeRunner.java
@@ -17,6 +17,10 @@
package org.apache.ignite.internal;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
+
import java.lang.reflect.Method;
import java.nio.file.Path;
import java.util.Collections;
@@ -29,6 +33,21 @@ import org.junit.jupiter.api.TestInfo;
*/
@SuppressWarnings("CallToSystemGetenv")
public class PlatformCompatibilityTestNodeRunner {
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " storage.profiles: {"
+ + " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ + " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " clientConnector.sendServerExceptionStackTraceToClient:
true,\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
/**
* Entry point.
@@ -47,7 +66,7 @@ public class PlatformCompatibilityTestNodeRunner {
System.out.println(">>> Ports: node=" + port + ", http=" + httpPort +
", client=" + clientPort);
ClusterConfiguration clusterConfiguration =
ClusterConfiguration.builder(new PlatformTestInfo(), Path.of(workDir))
-
.defaultNodeBootstrapConfigTemplate(CompatibilityTestBase.NODE_BOOTSTRAP_CFG_TEMPLATE)
+
.defaultNodeBootstrapConfigTemplate(NODE_BOOTSTRAP_CFG_TEMPLATE)
.basePort(port)
.baseHttpPort(httpPort)
.baseClientPort(clientPort)
diff --git
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItExecutionsCleanerTest.java
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItExecutionsCleanerTest.java
index 7585e2de0e2..bc38e0a268c 100644
---
a/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItExecutionsCleanerTest.java
+++
b/modules/compute/src/integrationTest/java/org/apache/ignite/internal/compute/ItExecutionsCleanerTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.compute;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static
org.apache.ignite.internal.IgniteExceptionTestUtils.traceableException;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
import static org.apache.ignite.internal.wrapper.Wrappers.unwrap;
@@ -72,12 +71,19 @@ class ItExecutionsCleanerTest extends
ClusterPerClassIntegrationTest {
@Override
protected String getNodeBootstrapConfigTemplate() {
- return renderConfigTemplate(
- " compute: {\n"
+ return "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " compute: {"
+ " threadPoolSize: 1,\n"
+ " statesLifetimeMillis: 1000\n"
+ " },\n"
- );
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
}
@BeforeEach
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
index 2cc30f7203f..fff6913e787 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.distributionzones;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
@@ -94,10 +93,17 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
@Language("HOCON")
private static String createStartConfig(@Language("HOCON") String
nodeAttributes, @Language("HOCON") String storageProfiles) {
- return renderConfigTemplate(
- " nodeAttributes.nodeAttributes: " + nodeAttributes + ",\n"
+ return "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },"
+ + " nodeAttributes.nodeAttributes: " + nodeAttributes + ",\n"
+ " storage.profiles: " + storageProfiles + ",\n"
- );
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
}
@Override
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTriggersRecoveryTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTriggersRecoveryTest.java
index 03a6d46d0cb..523cc30f4e9 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTriggersRecoveryTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTriggersRecoveryTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.rebalance;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.TestWrappers.unwrapTableManager;
import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal;
@@ -62,13 +61,35 @@ public class ItRebalanceTriggersRecoveryTest extends
ClusterPerTestIntegrationTe
private static final int PARTITION_ID = 0;
- private static final String US_NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " nodeAttributes.nodeAttributes: {region: US, zone: global},\n"
- );
-
- private static final String GLOBAL_NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " nodeAttributes.nodeAttributes: {zone: global},\n"
- );
+ private static final String US_NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " nodeAttributes: {\n"
+ + " nodeAttributes: {region: US, zone: global}\n"
+ + " },\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
+
+ private static final String GLOBAL_NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite
{\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " nodeAttributes: {\n"
+ + " nodeAttributes: {zone: global}\n"
+ + " },\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
@Override
protected int initialNodes() {
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
index 8e610f1ec4c..a0e2ed962f2 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java
@@ -19,8 +19,9 @@ package org.apache.ignite.internal.raftsnapshot;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
-import static org.apache.ignite.internal.ConfigTemplates.DEFAULT_PROFILES;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
@@ -136,10 +137,21 @@ class ItTableRaftSnapshotsTest extends
ClusterPerTestIntegrationTest {
* <p>installSnapshotTimeoutMillis is changed to 10 seconds so that
sporadic snapshot installation failures still
* allow tests pass thanks to retries.
*/
- private static final String NODE_BOOTSTRAP_CFG = renderConfigTemplate(
- DEFAULT_PROFILES
+ private static final String NODE_BOOTSTRAP_CFG = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ " raft.installSnapshotTimeoutMillis: 10000,\n"
- );
+ + " storage.profiles: {"
+ + " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ + " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
/**
* Marker that instructs to create a table with the default storage
engine. Used in tests that are indifferent
diff --git
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java
index c0f35d23b42..23767a520f0 100644
---
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/RestNode.java
@@ -82,7 +82,6 @@ public class RestNode {
private String bootstrapCfg() {
return "ignite {\n"
- + " network.listenAddresses: [127.0.0.1],\n"
+ " network.port: {},\n"
+ " network.nodeFinder.netClusterNodes: [ {} ],\n"
+ " clientConnector.port: {},\n"
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/client/ItClientDirectMappingTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/client/ItClientDirectMappingTest.java
index eb26638d5b7..ad39ceb7677 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/client/ItClientDirectMappingTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/client/ItClientDirectMappingTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.client;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
import static
org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -69,9 +68,18 @@ public class ItClientDirectMappingTest extends
ClusterPerClassIntegrationTest {
protected static final int PARTITIONS = 10;
/** Nodes bootstrap configuration pattern. */
- private static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " raft.responseTimeoutMillis: 30000,\n"
- );
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " rest.port: {},\n"
+ + " raft: { responseTimeoutMillis: 30000 },"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
@BeforeAll
public static void setup() throws Exception {
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterInitTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterInitTest.java
index 654ee12ebc1..4a1787d9e5e 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterInitTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterInitTest.java
@@ -105,7 +105,6 @@ public class ItClusterInitTest extends IgniteAbstractTest {
for (int port : ports) {
String config = "ignite {"
- + " network.listenAddresses: [127.0.0.1],"
+ " network.port: " + port + ","
+ " clientConnector.port: " + (port + 8000) + ","
+ " network.nodeFinder.netClusterNodes: " +
nodeFinderConfig + ","
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodeNamesTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodeNamesTest.java
index 55b0682e11c..141ddf8b51f 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodeNamesTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodeNamesTest.java
@@ -21,7 +21,6 @@ import static java.util.stream.Collectors.joining;
import static
org.apache.ignite.internal.ClusterConfiguration.DEFAULT_BASE_CLIENT_PORT;
import static
org.apache.ignite.internal.ClusterConfiguration.DEFAULT_BASE_HTTP_PORT;
import static
org.apache.ignite.internal.ClusterConfiguration.DEFAULT_BASE_PORT;
-import static
org.apache.ignite.internal.ConfigTemplates.NODE_BOOTSTRAP_CFG_TEMPLATE_WITHOUT_STORAGE_PROFILES;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.shortTestMethodName;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowWithCauseOrSuppressed;
@@ -56,6 +55,15 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(WorkDirectoryExtension.class)
class ItDuplicateNodeNamesTest extends BaseIgniteAbstractTest {
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + "}";
+
@WorkDirectory
private static Path WORK_DIR;
@@ -144,7 +152,7 @@ class ItDuplicateNodeNamesTest extends
BaseIgniteAbstractTest {
private IgniteServer startEmbeddedNode(String nodeName, int nodeIndex, int
nodesCount) {
String config = IgniteStringFormatter.format(
- NODE_BOOTSTRAP_CFG_TEMPLATE_WITHOUT_STORAGE_PROFILES,
+ NODE_BOOTSTRAP_CFG_TEMPLATE,
DEFAULT_BASE_PORT + nodeIndex,
seedAddressesString(nodesCount),
DEFAULT_BASE_CLIENT_PORT + nodeIndex,
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
index 343bc0efebf..9bd9a48701a 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
@@ -119,7 +119,6 @@ public class ItNodeBootstrapConfigurationTest {
+ " }\n"
+ " }\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1]\n"
+ " port: 3344\n"
+ " nodeFinder {\n"
+ " netClusterNodes: [ \"localhost:3344\" ]\n"
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteServerTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteServerTest.java
index 267c432a81c..f30df3542d6 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteServerTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteServerTest.java
@@ -67,7 +67,6 @@ import org.junit.jupiter.params.provider.EnumSource;
class ItIgniteServerTest extends BaseIgniteAbstractTest {
private static final String NODE_CONFIGURATION_TEMPLATE = "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: {},\n"
+ " nodeFinder.netClusterNodes: [ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\" ]\n"
+ " },\n"
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItNoThreadsLeftTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItNoThreadsLeftTest.java
index 4370a91467f..0f52f44f22c 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItNoThreadsLeftTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItNoThreadsLeftTest.java
@@ -57,7 +57,6 @@ public class ItNoThreadsLeftTest extends IgniteAbstractTest {
/** One node cluster configuration. */
private static final String NODE_CONFIGURATION =
"ignite {\n"
- + " network.listenAddresses: [127.0.0.1],\n"
+ " network.port: 3344,\n"
+ " network.nodeFinder.netClusterNodes: [ \"localhost:3344\" ]\n"
+ "}";
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
index 00c8a5b2af6..68254a66639 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
@@ -160,7 +160,6 @@ public class PlatformTestNodeRunner {
+ " \"clientConnector\":{\"port\":
10942,\"idleTimeoutMillis\":6000,\""
+ "sendServerExceptionStackTraceToClient\":true},"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":3344,\n"
+ " \"nodeFinder\": {\n"
+ " \"netClusterNodes\":[ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\", \"localhost:3347\" ]\n"
@@ -173,7 +172,6 @@ public class PlatformTestNodeRunner {
+ " \"clientConnector\":{\"port\":
10943,\"idleTimeoutMillis\":6000,"
+ "\"sendServerExceptionStackTraceToClient\":true},"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":3345,\n"
+ " \"nodeFinder\": {\n"
+ " \"netClusterNodes\":[ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\", \"localhost:3347\" ]\n"
@@ -196,7 +194,6 @@ public class PlatformTestNodeRunner {
+ " }\n"
+ " },\n"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":3346,\n"
+ " \"nodeFinder\": {\n"
+ " \"netClusterNodes\":[ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\", \"localhost:3347\" ]\n"
@@ -224,7 +221,6 @@ public class PlatformTestNodeRunner {
+ " }\n"
+ " },\n"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":3347,\n"
+ " \"nodeFinder\": {\n"
+ " \"netClusterNodes\":[ \"localhost:3344\",
\"localhost:3345\", \"localhost:3346\", \"localhost:3347\" ]\n"
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
index cd2af11cb95..6384870f222 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItAbstractThinClientTest.java
@@ -107,7 +107,6 @@ public abstract class ItAbstractThinClientTest extends
BaseIgniteAbstractTest {
nodesBootstrapCfg.put(
nodeName,
"ignite {\n"
- + " network.listenAddresses: [127.0.0.1],\n"
+ " network.port: " + (3344 + i) + ",\n"
+ " network.nodeFinder.netClusterNodes: [
\"localhost:3344\" ]\n"
+ (enableTracesPredicate(i) ? ("
clientConnector.sendServerExceptionStackTraceToClient: true\n"
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientChannelValidatorTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientChannelValidatorTest.java
index 47bcaf85fa8..d8be376ae69 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientChannelValidatorTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientChannelValidatorTest.java
@@ -245,7 +245,6 @@ public class ItThinClientChannelValidatorTest extends
BaseIgniteAbstractTest {
nodesBootstrapCfg.put(
nodeName,
"ignite {\n"
- + " network.listenAddresses: [127.0.0.1],\n"
+ " network.port: " + (3344 + i) + ",\n"
+ " network.nodeFinder.netClusterNodes: [
\"localhost:3344\" ]\n"
+ (i == 1 ? ("
clientConnector.sendServerExceptionStackTraceToClient: true\n"
diff --git
a/modules/runner/src/test/java/org/apache/ignite/internal/app/IgniteServerStartTest.java
b/modules/runner/src/test/java/org/apache/ignite/internal/app/IgniteServerStartTest.java
index 899159b7fb0..d4856990a1c 100644
---
a/modules/runner/src/test/java/org/apache/ignite/internal/app/IgniteServerStartTest.java
+++
b/modules/runner/src/test/java/org/apache/ignite/internal/app/IgniteServerStartTest.java
@@ -56,7 +56,6 @@ public class IgniteServerStartTest extends
BaseIgniteAbstractTest {
private static final String IGNITE_SERVER_CONFIGURATION = "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: " + IGNITE_SERVER_PORT + ",\n"
+ " nodeFinder.netClusterNodes: [ \"localhost:" +
IGNITE_SERVER_PORT + "\" ]\n"
+ " },\n"
diff --git
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
index 17f44287e94..5f9b2c571f7 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/BaseIgniteRestartTest.java
@@ -97,7 +97,6 @@ public abstract class BaseIgniteRestartTest extends
IgniteAbstractTest {
/** Nodes bootstrap configuration pattern. */
@Language("HOCON")
protected static final String NODE_BOOTSTRAP_CFG = "ignite {\n"
- + " network.listenAddresses: [127.0.0.1],\n"
+ " network.port: {},\n"
+ " network.nodeFinder.netClusterNodes: {}\n"
+ " network.membership: {\n"
diff --git
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterConfiguration.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterConfiguration.java
index 1606a4de88f..b2f844d5092 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterConfiguration.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ClusterConfiguration.java
@@ -43,7 +43,6 @@ public class ClusterConfiguration {
/** Default nodes bootstrap configuration pattern. */
private static final String DEFAULT_NODE_BOOTSTRAP_CFG = "ignite {\n"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":{},\n"
+ " \"nodeFinder\":{\n"
+ " \"netClusterNodes\": [ {} ]\n"
diff --git
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ConfigTemplates.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ConfigTemplates.java
index 4b1b8695cb2..0f71c8a27fd 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ConfigTemplates.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/ConfigTemplates.java
@@ -26,7 +26,7 @@ import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_TEST_P
* Node configuration templates.
*/
public class ConfigTemplates {
- public static final String DEFAULT_PROFILES = ""
+ private static final String DEFAULT_PROFILES = ""
+ " storage.profiles: {"
+ " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
@@ -34,7 +34,7 @@ public class ConfigTemplates {
+ " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ " },\n";
- public static final String FAST_FAILURE_DETECTION = ""
+ private static final String FAST_FAILURE_DETECTION = ""
+ " network.membership: {\n"
+ " membershipSyncIntervalMillis: 1000,\n"
+ " failurePingIntervalMillis: 500,\n"
@@ -73,7 +73,6 @@ public class ConfigTemplates {
public static String renderConfigTemplate(String properties) {
return "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [\"127.0.0.1\"],\n"
+ " port: {},\n"
+ " nodeFinder.netClusterNodes: [ {} ]\n"
+ " },\n"
diff --git
a/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
b/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
index a399cdfb838..47160d66d06 100644
---
a/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
+++
b/modules/security/src/integrationTest/java/org/apache/ignite/internal/ssl/ItSslTest.java
@@ -79,7 +79,6 @@ public class ItSslTest {
@Language("JSON")
String sslDisabledBoostrapConfig = "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " ssl.enabled: false,\n"
+ " port: {},\n"
+ " nodeFinder:{\n"
@@ -165,7 +164,6 @@ public class ItSslTest {
@Language("JSON")
String sslEnabledBoostrapConfig = "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " ssl : {"
+ " enabled: true,\n"
+ " trustStore: {\n"
@@ -423,7 +421,6 @@ public class ItSslTest {
@Language("JSON")
String sslEnabledBoostrapConfig = "ignite {\n"
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " ssl : {"
+ " enabled: true,\n"
+ " clientAuth: \"require\",\n"
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlCreateZoneTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlCreateZoneTest.java
index 9fa09490c4b..04d14234df5 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlCreateZoneTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlCreateZoneTest.java
@@ -17,8 +17,10 @@
package org.apache.ignite.internal.sql.api;
-import static org.apache.ignite.internal.ConfigTemplates.DEFAULT_PROFILES;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME;
+import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_TEST_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
@@ -51,10 +53,22 @@ class ItSqlCreateZoneTest extends
ClusterPerTestIntegrationTest {
private static final String NOT_EXISTED_PROFILE_NAME =
"not-existed-profile";
private static final String EXTRA_PROFILE_NAME = "extra-profile";
/** Nodes bootstrap configuration pattern. */
- private static final String NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_EXTRA_PROFILE
= renderConfigTemplate(
- DEFAULT_PROFILES
- + "storage.profiles." + EXTRA_PROFILE_NAME + ".engine:
aipersist,\n"
- );
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_EXTRA_PROFILE
= "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder.netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " storage.profiles: {"
+ + " " + DEFAULT_TEST_PROFILE_NAME + ".engine: test, "
+ + " " + DEFAULT_AIPERSIST_PROFILE_NAME + ".engine:
aipersist, "
+ + " " + DEFAULT_AIMEM_PROFILE_NAME + ".engine: aimem, "
+ + " " + EXTRA_PROFILE_NAME + ".engine: aipersist, "
+ + " " + DEFAULT_ROCKSDB_PROFILE_NAME + ".engine: rocksdb"
+ + " },\n"
+ + " clientConnector.port: {},\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
@Override
protected int initialNodes() {
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java
index d14524629c2..af98fb64349 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.sql.engine;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.sql.engine.util.QueryChecker.matches;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.notNullValue;
@@ -39,9 +38,20 @@ import org.junit.jupiter.params.provider.EnumSource;
* Tests to make sure sql engine can recover execution when run on unstable
topology.
*/
public class ItUnstableTopologyTest extends BaseSqlIntegrationTest {
- private static final String DATA_NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " nodeAttributes.nodeAttributes: {role: data},\n"
- );
+ private static final String DATA_NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " nodeAttributes: {\n"
+ + " nodeAttributes: { role: data }\n"
+ + " },\n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
private static final Pattern NODE_NAME_PATTERN =
Pattern.compile(".*?=\\[(?<nodeName>.*?)=\\{.*");
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
index 35758d71981..2644b79be24 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/sqllogic/ItSqlLogicTest.java
@@ -176,7 +176,6 @@ public class ItSqlLogicTest extends BaseIgniteAbstractTest {
/** Nodes bootstrap configuration pattern. */
private static final String NODE_BOOTSTRAP_CFG = "ignite {\n"
+ " \"network\": {\n"
- + " \"listenAddresses\": [\"127.0.0.1\"],\n"
+ " \"port\":{},\n"
+ " \"nodeFinder\":{\n"
+ " \"netClusterNodes\": [ {} ]\n"
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java
index 438e9dbaacc..7af3be4746a 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java
@@ -76,7 +76,6 @@ public class
ItHighAvailablePartitionsRecoveryByFilterUpdateTest extends Abstrac
+ " nodeAttributes.nodeAttributes: " + nodeAttributes + ",\n"
+ (storageProfiles == null ? "" : " storage.profiles: " +
storageProfiles + ",\n")
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: {},\n"
+ " nodeFinder: {\n"
+ " netClusterNodes: [ {} ]\n"
@@ -537,7 +536,6 @@ public class
ItHighAvailablePartitionsRecoveryByFilterUpdateTest extends Abstrac
+ " nodeAttributes.nodeAttributes: " + nodeAtrributes + ",\n"
+ (storageProfiles == null ? "" : " storage.profiles: " +
storageProfiles + ",\n")
+ " network: {\n"
- + " listenAddresses: [127.0.0.1],\n"
+ " port: {},\n"
+ " nodeFinder: {\n"
+ " netClusterNodes: [ {} ]\n"
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryWithNodeRestartTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryWithNodeRestartTest.java
index 62fdc030c09..5bfedc7acf7 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryWithNodeRestartTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryWithNodeRestartTest.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.table.distributed.disaster;
-import static
org.apache.ignite.internal.ConfigTemplates.FAST_FAILURE_DETECTION;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -44,10 +42,35 @@ class ItHighAvailablePartitionsRecoveryWithNodeRestartTest
extends AbstractHighA
/** Should be greater than 2 x {@link #LW_UPDATE_TIME_MS} and long enough
to await for the catalog compaction finish. */
private static final long CATALOG_COMPACTION_AWAIT_INTERVAL_MS =
TimeUnit.SECONDS.toMillis(10);
- private static final String
FAST_FAILURE_DETECTION_AND_FAST_CHECKPOINT_NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- FAST_FAILURE_DETECTION
- + " storage.engines.aipersist.checkpoint.intervalMillis: " +
AIPERSIST_CHECKPOINT_INTERVAL_MS + ",\n"
- );
+ private static final String
FAST_FAILURE_DETECTION_AND_FAST_CHECKPOINT_NODE_BOOTSTRAP_CFG_TEMPLATE =
"ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " },\n"
+ + " membership: {\n"
+ + " membershipSyncIntervalMillis: 1000,\n"
+ + " failurePingIntervalMillis: 500,\n"
+ + " scaleCube: {\n"
+ + " membershipSuspicionMultiplier: 1,\n"
+ + " failurePingRequestMembers: 1,\n"
+ + " gossipIntervalMillis: 10\n"
+ + " },\n"
+ + " }\n"
+ + " },\n"
+ + " storage: {\n"
+ + " engines: {\n"
+ + " aipersist: {\n"
+ + " checkpoint: {\n"
+ + " intervalMillis: " + AIPERSIST_CHECKPOINT_INTERVAL_MS
+ "\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " }\n"
+ + " clientConnector: { port:{} }, \n"
+ + " rest.port: {},\n"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
@Override
protected int initialNodes() {
diff --git
a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTransactionPrimaryChangeTest.java
b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTransactionPrimaryChangeTest.java
index 762a91b0f9f..fac22ca1f16 100644
---
a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTransactionPrimaryChangeTest.java
+++
b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTransactionPrimaryChangeTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.tx.distributed;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static
org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static
org.apache.ignite.internal.TestWrappers.unwrapInternalTransaction;
@@ -55,9 +54,18 @@ public class ItTransactionPrimaryChangeTest extends
ClusterPerTestIntegrationTes
private static final String TABLE_NAME = "test_table";
/** Nodes bootstrap configuration pattern. */
- private static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " raft.responseTimeoutMillis: 30000,\n"
- );
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " rest.port: {},\n"
+ + " raft: { responseTimeoutMillis: 30000 },"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
@BeforeEach
public void setup() {
diff --git
a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
index fc945179653..a95b6aa0551 100644
---
a/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
+++
b/modules/transactions/src/integrationTest/java/org/apache/ignite/tx/distributed/ItTxResourcesVacuumTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.tx.distributed;
import static java.util.stream.Collectors.toSet;
-import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static
org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
import static
org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate;
@@ -105,9 +104,18 @@ public class ItTxResourcesVacuumTest extends
ClusterPerTestIntegrationTest {
private static final int REPLICAS = 2;
/** Nodes bootstrap configuration pattern. */
- private static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
- " raft.responseTimeoutMillis: 30000,\n"
- );
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE = "ignite {\n"
+ + " network: {\n"
+ + " port: {},\n"
+ + " nodeFinder: {\n"
+ + " netClusterNodes: [ {} ]\n"
+ + " }\n"
+ + " },\n"
+ + " clientConnector: { port:{} },\n"
+ + " rest.port: {},\n"
+ + " raft: { responseTimeoutMillis: 30000 },"
+ + " failureHandler.dumpThreadsOnFailure: false\n"
+ + "}";
private final ExecutorService txStateStorageExecutor =
Executors.newSingleThreadExecutor(
IgniteThreadFactory.create("test",
"tx-state-storage-test-pool-itrvt", log, ThreadOperation.STORAGE_READ)
