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 139525fe9de IGNITE-28298 Use loopback IP address as listen address in
tests (#7824)
139525fe9de is described below
commit 139525fe9dedb4d2c57f9995c4da35f8d0f1349c
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Thu Mar 19 16:09:17 2026 +0200
IGNITE-28298 Use loopback IP address as listen address in tests (#7824)
---
.../compaction/ItCatalogCompactionTest.java | 28 ++++------------
...eryAfterCatalogTruncatedAboveStoredLwmTest.java | 30 ++++--------------
.../org/apache/ignite/internal/NodeConfig.java | 2 ++
.../configuration/ItConfigCommandTest.java | 6 ++--
.../management/raft/ItCmgRaftServiceTest.java | 4 +--
.../management/topology/ItLogicalTopologyTest.java | 14 +++-----
.../management/BaseItClusterManagementTest.java | 6 ++--
.../PlatformCompatibilityTestNodeRunner.java | 21 +-----------
.../internal/compute/ItExecutionsCleanerTest.java | 14 +++-----
.../ItDistributionZonesFiltersTest.java | 14 +++-----
.../rebalance/ItRebalanceTriggersRecoveryTest.java | 37 +++++-----------------
.../impl/ItIdempotentCommandCacheTest.java | 4 +--
.../impl/ItMetaStorageManagerImplTest.java | 2 +-
.../ItMetaStorageMultipleNodesAbstractTest.java | 2 +-
.../service/ItAbstractListenerSnapshotTest.java | 8 +----
.../network/scalecube/ItClusterServiceTest.java | 6 ++--
.../network/utils/ClusterServiceTestUtils.java | 3 +-
.../replicator/ItAbstractColocationTest.java | 4 +--
.../MultiActorPlacementDriverTest.java | 2 +-
.../PlacementDriverManagerTest.java | 4 +--
.../ignite/internal/raft/ItLearnersTest.java | 6 ++--
.../apache/ignite/internal/raft/ItLozaTest.java | 2 +-
.../raftsnapshot/ItTableRaftSnapshotsTest.java | 22 +++----------
.../raft/server/ItSimpleCounterServerTest.java | 2 +-
.../PhysicalTopologyAwareRaftGroupServiceTest.java | 2 +-
.../apache/ignite/raft/jraft/test/TestUtils.java | 10 +-----
.../ItPlacementDriverReplicaSideTest.java | 2 +-
.../AbstractTopologyAwareGroupServiceTest.java | 2 +-
.../org/apache/ignite/internal/rest/RestNode.java | 1 +
.../internal/client/ItClientDirectMappingTest.java | 16 +++-------
.../cluster/management/ItClusterInitTest.java | 1 +
.../management/ItDuplicateNodeNamesTest.java | 12 ++-----
.../ItDistributedConfigurationPropertiesTest.java | 4 +--
.../ItNodeBootstrapConfigurationTest.java | 1 +
.../ItDistributedConfigurationStorageTest.java | 2 +-
.../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 +
.../java/org/apache/ignite/internal/Cluster.java | 2 +-
.../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 +
.../ReplicasSafeTimePropagationTest.java | 2 +-
...ilablePartitionsRecoveryByFilterUpdateTest.java | 2 ++
...lablePartitionsRecoveryWithNodeRestartTest.java | 35 ++++----------------
.../ItTransactionPrimaryChangeTest.java | 16 +++-------
.../tx/distributed/ItTxResourcesVacuumTest.java | 16 +++-------
54 files changed, 130 insertions(+), 303 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 582ceeb98ad..0fd5a3145cc 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,26 +92,10 @@ class ItCatalogCompactionTest extends
ClusterPerClassIntegrationTest {
@Override
protected String getNodeBootstrapConfigTemplate() {
- 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"
- + "}";
+ return renderConfigTemplate(
+ DEFAULT_PROFILES
+ + " storage.engines.aipersist.checkpoint.intervalMillis: " +
CHECK_POINT_INTERVAL_MS + ",\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 8401eee9142..3c980354185 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,10 +17,8 @@
package org.apache.ignite.internal.catalog.compaction;
-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.ConfigTemplates.DEFAULT_PROFILES;
+import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -48,26 +46,10 @@ class ItNodeRecoveryAfterCatalogTruncatedAboveStoredLwmTest
extends ClusterPerTe
@Override
protected String getNodeBootstrapConfigTemplate() {
- 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"
- + "}";
+ return renderConfigTemplate(
+ DEFAULT_PROFILES
+ + " storage.engines.aipersist.checkpoint.intervalMillis:
250,\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 794e6477e73..2516ae15fbf 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,6 +46,7 @@ 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"
@@ -84,6 +85,7 @@ 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/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
index a09a509c35c..b38f65ba111 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
@@ -438,9 +438,9 @@ class ItConfigCommandTest extends CliIntegrationTest {
this::assertExitCodeIsZero,
this::assertErrOutputIsEmpty,
() -> assertOutputIs("[\n"
- + " \"localhost:3344\",\n"
- + " \"localhost:3345\",\n"
- + " \"localhost:3346\"\n"
+ + " \"127.0.0.1:3344\",\n"
+ + " \"127.0.0.1:3345\",\n"
+ + " \"127.0.0.1:3346\"\n"
+ "]" + System.lineSeparator()
)
);
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
index f4efbce851f..e5ad703470b 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
+++
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/raft/ItCmgRaftServiceTest.java
@@ -235,8 +235,8 @@ public class ItCmgRaftServiceTest extends
BaseIgniteAbstractTest {
@BeforeEach
void setUp(@WorkDirectory Path workDir, TestInfo testInfo) {
- var addr1 = new NetworkAddress("localhost", 10000);
- var addr2 = new NetworkAddress("localhost", 10001);
+ var addr1 = new NetworkAddress("127.0.0.1", 10000);
+ var addr2 = new NetworkAddress("127.0.0.1", 10001);
var nodeFinder = new StaticNodeFinder(List.of(addr1, addr2));
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 57661230558..947f9b80b53 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,6 +19,7 @@ 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;
@@ -68,17 +69,10 @@ 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 = "ignite
{\n"
- + " network: {\n"
- + " port: {},\n"
- + " nodeFinder.netClusterNodes: [ {} ]\n"
- + " },\n"
- + " nodeAttributes.nodeAttributes: {region = US, storage =
SSD},\n"
+ private static final String
NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_NODE_ATTRIBUTES_AND_STORAGE_PROFILES =
renderConfigTemplate(
+ " 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/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
index 0d5d7066dc3..37869d33775 100644
---
a/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
+++
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/BaseItClusterManagementTest.java
@@ -105,7 +105,7 @@ public abstract class BaseItClusterManagementTest extends
IgniteAbstractTest {
protected MockNode createNode(int idx, int clusterSize,
Consumer<RaftGroupConfiguration> onConfigurationCommittedListener) {
return new MockNode(
testInfo,
- new NetworkAddress("localhost", PORT_BASE + idx),
+ new NetworkAddress("127.0.0.1", PORT_BASE + idx),
new StaticNodeFinder(createSeedAddresses(clusterSize)),
workDir,
raftConfiguration,
@@ -124,7 +124,7 @@ public abstract class BaseItClusterManagementTest extends
IgniteAbstractTest {
) {
return new MockNode(
testInfo,
- new NetworkAddress("localhost", PORT_BASE + idx),
+ new NetworkAddress("127.0.0.1", PORT_BASE + idx),
new StaticNodeFinder(createSeedAddresses(clusterSize)),
workDir,
raftConfiguration,
@@ -143,7 +143,7 @@ public abstract class BaseItClusterManagementTest extends
IgniteAbstractTest {
private static List<NetworkAddress> createSeedAddresses(int clusterSize) {
return IntStream.range(0, clusterSize)
- .mapToObj(i -> new NetworkAddress("localhost", PORT_BASE + i))
+ .mapToObj(i -> new NetworkAddress("127.0.0.1", PORT_BASE + i))
.collect(toUnmodifiableList());
}
}
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 9b19fe29992..cc2a43b3fe5 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,10 +17,6 @@
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;
@@ -33,21 +29,6 @@ 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.
@@ -66,7 +47,7 @@ public class PlatformCompatibilityTestNodeRunner {
System.out.println(">>> Ports: node=" + port + ", http=" + httpPort +
", client=" + clientPort);
ClusterConfiguration clusterConfiguration =
ClusterConfiguration.builder(new PlatformTestInfo(), Path.of(workDir))
-
.defaultNodeBootstrapConfigTemplate(NODE_BOOTSTRAP_CFG_TEMPLATE)
+
.defaultNodeBootstrapConfigTemplate(CompatibilityTestBase.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 bc38e0a268c..7585e2de0e2 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,6 +17,7 @@
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;
@@ -71,19 +72,12 @@ class ItExecutionsCleanerTest extends
ClusterPerClassIntegrationTest {
@Override
protected String getNodeBootstrapConfigTemplate() {
- return "ignite {\n"
- + " network: {\n"
- + " port: {},\n"
- + " nodeFinder.netClusterNodes: [ {} ]\n"
- + " },\n"
- + " clientConnector.port: {},\n"
- + " rest.port: {},\n"
- + " compute: {"
+ return renderConfigTemplate(
+ " compute: {\n"
+ " 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 fff6913e787..2cc30f7203f 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,6 +18,7 @@
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;
@@ -93,17 +94,10 @@ public class ItDistributionZonesFiltersTest extends
ClusterPerTestIntegrationTes
@Language("HOCON")
private static String createStartConfig(@Language("HOCON") String
nodeAttributes, @Language("HOCON") String storageProfiles) {
- return "ignite {\n"
- + " network: {\n"
- + " port: {},\n"
- + " nodeFinder.netClusterNodes: [ {} ]\n"
- + " },"
- + " nodeAttributes.nodeAttributes: " + nodeAttributes + ",\n"
+ return renderConfigTemplate(
+ " 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 523cc30f4e9..03a6d46d0cb 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,6 +17,7 @@
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;
@@ -61,35 +62,13 @@ public class ItRebalanceTriggersRecoveryTest extends
ClusterPerTestIntegrationTe
private static final int PARTITION_ID = 0;
- 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"
- + "}";
+ 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"
+ );
@Override
protected int initialNodes() {
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
index ce1e185ccda..6270d4963b9 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItIdempotentCommandCacheTest.java
@@ -197,10 +197,10 @@ class ItIdempotentCommandCacheTest extends
IgniteAbstractTest {
List<NetworkAddress> addrs = new ArrayList<>();
for (int i = 0; i < NODES_COUNT; i++) {
- addrs.add(new NetworkAddress("localhost", 10_000 + i));
+ addrs.add(new NetworkAddress("127.0.0.1", 10_000 + i));
}
- var localAddr = new NetworkAddress("localhost", 10_000 + index);
+ var localAddr = new NetworkAddress("127.0.0.1", 10_000 + index);
clusterService = clusterService(testInfo, localAddr.port(), new
StaticNodeFinder(addrs));
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
index eaf00036896..9d9131c6bc8 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
@@ -153,7 +153,7 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
TestInfo testInfo,
@InjectConfiguration("mock.idleSafeTimeSyncIntervalMillis = 100")
SystemDistributedConfiguration systemConfiguration
) {
- var addr = new NetworkAddress("localhost", 10_000);
+ var addr = new NetworkAddress("127.0.0.1", 10_000);
clusterService = clusterService(testInfo, addr.port(), new
StaticNodeFinder(List.of(addr)));
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
index 034c552ddd9..456dcadd6d0 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
@@ -298,7 +298,7 @@ abstract class ItMetaStorageMultipleNodesAbstractTest
extends IgniteAbstractTest
final List<Node> nodes = new ArrayList<>();
final Node startNode() {
- var nodeFinder = new StaticNodeFinder(List.of(new
NetworkAddress("localhost", 10_000)));
+ var nodeFinder = new StaticNodeFinder(List.of(new
NetworkAddress("127.0.0.1", 10_000)));
ClusterService clusterService =
ClusterServiceTestUtils.clusterService(testInfo, 10_000 + nodes.size(),
nodeFinder);
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/raft/service/ItAbstractListenerSnapshotTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/raft/service/ItAbstractListenerSnapshotTest.java
index 93a910deb05..cf7ea164882 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/raft/service/ItAbstractListenerSnapshotTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/raft/service/ItAbstractListenerSnapshotTest.java
@@ -30,8 +30,6 @@ import static
org.apache.ignite.internal.util.IgniteUtils.stopAsync;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@@ -405,11 +403,7 @@ public abstract class ItAbstractListenerSnapshotTest<T
extends RaftGroupListener
* Returns local address.
*/
private static String getLocalAddress() {
- try {
- return InetAddress.getLocalHost().getHostAddress();
- } catch (UnknownHostException e) {
- throw new RuntimeException(e);
- }
+ return "127.0.0.1";
}
/**
diff --git
a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/scalecube/ItClusterServiceTest.java
b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/scalecube/ItClusterServiceTest.java
index 859856e036e..707c6aef2a7 100644
---
a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/scalecube/ItClusterServiceTest.java
+++
b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/scalecube/ItClusterServiceTest.java
@@ -53,7 +53,7 @@ public class ItClusterServiceTest extends
BaseIgniteAbstractTest {
@Test
void testShutdown(TestInfo testInfo) {
- var addr = new NetworkAddress("localhost", 10000);
+ var addr = new NetworkAddress("127.0.0.1", 10000);
ClusterService service = clusterService(testInfo, addr.port(), new
StaticNodeFinder(List.of(addr)));
@@ -73,8 +73,8 @@ public class ItClusterServiceTest extends
BaseIgniteAbstractTest {
@Test
void testUpdateMetadata(TestInfo testInfo) throws Exception {
- var addr1 = new NetworkAddress("localhost", 10000);
- var addr2 = new NetworkAddress("localhost", 10001);
+ var addr1 = new NetworkAddress("127.0.0.1", 10000);
+ var addr2 = new NetworkAddress("127.0.0.1", 10001);
ClusterService service1 = clusterService(testInfo, addr1.port(), new
StaticNodeFinder(List.of(addr1, addr2)));
ClusterService service2 = clusterService(testInfo, addr2.port(), new
StaticNodeFinder(List.of(addr1, addr2)));
assertThat(service1.startAsync(new ComponentContext()),
willCompleteSuccessfully());
diff --git
a/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
b/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
index 35e1c142aaa..364859dd0c7 100644
---
a/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
+++
b/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
@@ -234,6 +234,7 @@ public class ClusterServiceTestUtils {
networkConfiguration.change(netCfg ->
netCfg
.changePort(port)
+ .changeListenAddresses("127.0.0.1")
.changeNodeFinder(c -> c
.convert(StaticNodeFinderChange.class)
.changeNetClusterNodes(netClusterNodes)
@@ -281,7 +282,7 @@ public class ClusterServiceTestUtils {
*/
public static List<NetworkAddress> findLocalAddresses(int startPort, int
endPort) {
return IntStream.range(startPort, endPort)
- .mapToObj(port -> new NetworkAddress("localhost", port))
+ .mapToObj(port -> new NetworkAddress("127.0.0.1", port))
.collect(toUnmodifiableList());
}
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItAbstractColocationTest.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItAbstractColocationTest.java
index 1bb5a4d3744..b5d08f6f77d 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItAbstractColocationTest.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItAbstractColocationTest.java
@@ -155,7 +155,7 @@ abstract class ItAbstractColocationTest extends
IgniteAbstractTest {
@Nullable List<NodeAttributesConfiguration> customAttributes
) throws Exception {
List<NetworkAddress> addresses = IntStream.range(0, size)
- .mapToObj(i -> new NetworkAddress("localhost", BASE_PORT + i))
+ .mapToObj(i -> new NetworkAddress("127.0.0.1", BASE_PORT + i))
.collect(toList());
nodeFinder = new StaticNodeFinder(addresses);
@@ -198,7 +198,7 @@ abstract class ItAbstractColocationTest extends
IgniteAbstractTest {
}
Node addNodeToCluster(int idx) {
- Node node = newNode(new NetworkAddress("localhost", BASE_PORT + idx),
nodeFinder);
+ Node node = newNode(new NetworkAddress("127.0.0.1", BASE_PORT + idx),
nodeFinder);
cluster.add(node);
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
index 08f36322a2f..cf437b7a02c 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
@@ -213,7 +213,7 @@ public class MultiActorPlacementDriverTest extends
BasePlacementDriverTest {
var res = new HashMap<String, ClusterService>(nodeNames.size());
var nodeFinder = new StaticNodeFinder(IntStream.range(BASE_PORT,
BASE_PORT + 5)
- .mapToObj(p -> new NetworkAddress("localhost", p))
+ .mapToObj(p -> new NetworkAddress("127.0.0.1", p))
.collect(Collectors.toList()));
int port = BASE_PORT;
diff --git
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
index a89a9ef5960..d6f33a924bb 100644
---
a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
+++
b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
@@ -182,7 +182,7 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
}
private void startPlacementDriverManager() {
- var nodeFinder = new StaticNodeFinder(Collections.singletonList(new
NetworkAddress("localhost", PORT)));
+ var nodeFinder = new StaticNodeFinder(Collections.singletonList(new
NetworkAddress("127.0.0.1", PORT)));
clusterService = ClusterServiceTestUtils.clusterService(testInfo,
PORT, nodeFinder);
anotherClusterService =
ClusterServiceTestUtils.clusterService(testInfo, PORT + 1, nodeFinder);
@@ -530,7 +530,7 @@ public class PlacementDriverManagerTest extends
BasePlacementDriverTest {
ClusterService nodeClusterService =
ClusterServiceTestUtils.clusterService(
testInfo,
port,
- new StaticNodeFinder(Collections.singletonList(new
NetworkAddress("localhost", PORT)))
+ new StaticNodeFinder(Collections.singletonList(new
NetworkAddress("127.0.0.1", PORT)))
);
nodeClusterService.messagingService().addMessageHandler(
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLearnersTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLearnersTest.java
index 5b1dfb8a3f4..187fb926cf5 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLearnersTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLearnersTest.java
@@ -98,9 +98,9 @@ public class ItLearnersTest extends IgniteAbstractTest {
}
private static final List<NetworkAddress> ADDRS = List.of(
- new NetworkAddress("localhost", 5001),
- new NetworkAddress("localhost", 5002),
- new NetworkAddress("localhost", 5003)
+ new NetworkAddress("127.0.0.1", 5001),
+ new NetworkAddress("127.0.0.1", 5002),
+ new NetworkAddress("127.0.0.1", 5003)
);
private static final int AWAIT_TIMEOUT_SECONDS = 10;
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
index a6da206419c..3c63a1ea511 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItLozaTest.java
@@ -102,7 +102,7 @@ public class ItLozaTest extends IgniteAbstractTest {
@BeforeEach
void setUp(TestInfo testInfo) {
- var addr = new NetworkAddress("localhost", PORT);
+ var addr = new NetworkAddress("127.0.0.1", PORT);
clusterService = clusterService(testInfo, PORT, new
StaticNodeFinder(List.of(addr)));
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 a0e2ed962f2..8e610f1ec4c 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,9 +19,8 @@ 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.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.ConfigTemplates.DEFAULT_PROFILES;
+import static org.apache.ignite.internal.ConfigTemplates.renderConfigTemplate;
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;
@@ -137,21 +136,10 @@ 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 = "ignite {\n"
- + " network: {\n"
- + " port: {},\n"
- + " nodeFinder.netClusterNodes: [ {} ]\n"
- + " },\n"
+ private static final String NODE_BOOTSTRAP_CFG = renderConfigTemplate(
+ DEFAULT_PROFILES
+ " 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/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItSimpleCounterServerTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItSimpleCounterServerTest.java
index a65a9bd3e99..4928d60a884 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItSimpleCounterServerTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ItSimpleCounterServerTest.java
@@ -106,7 +106,7 @@ class ItSimpleCounterServerTest extends
RaftServerAbstractTest {
*/
@BeforeEach
void before() throws Exception {
- var addr = new NetworkAddress("localhost", PORT);
+ var addr = new NetworkAddress("127.0.0.1", PORT);
service = clusterService(PORT, List.of(addr), true);
diff --git
a/modules/raft/src/test/java/org/apache/ignite/internal/raft/client/PhysicalTopologyAwareRaftGroupServiceTest.java
b/modules/raft/src/test/java/org/apache/ignite/internal/raft/client/PhysicalTopologyAwareRaftGroupServiceTest.java
index 803862177d9..b954c4dd295 100644
---
a/modules/raft/src/test/java/org/apache/ignite/internal/raft/client/PhysicalTopologyAwareRaftGroupServiceTest.java
+++
b/modules/raft/src/test/java/org/apache/ignite/internal/raft/client/PhysicalTopologyAwareRaftGroupServiceTest.java
@@ -253,7 +253,7 @@ public class PhysicalTopologyAwareRaftGroupServiceTest
extends IgniteAbstractTes
InternalClusterNode leader = firstLeaderRef.get();
// Forcing the leader change by stopping the actual leader.
- var addressToStop = new NetworkAddress("localhost",
leader.address().port());
+ var addressToStop = new NetworkAddress(leader.address().host(),
leader.address().port());
var raftServerToStop = raftServers.remove(addressToStop);
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/test/TestUtils.java
b/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/test/TestUtils.java
index 3ffc696c5f4..291dcdf5c56 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/test/TestUtils.java
+++
b/modules/raft/src/testFixtures/java/org/apache/ignite/raft/jraft/test/TestUtils.java
@@ -25,14 +25,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.BooleanSupplier;
-import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.raft.jraft.JRaftUtils;
import org.apache.ignite.raft.jraft.Node;
@@ -91,12 +88,7 @@ public class TestUtils {
* @return localhost IP address
*/
public static String getLocalAddress() {
- try {
- return InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e) {
- throw new IgniteInternalException(e);
- }
+ return "127.0.0.1";
}
public static List<LogEntry> mockEntries(int n) {
diff --git
a/modules/replicator/src/integrationTest/java/org/apache/ignite/internal/replicator/ItPlacementDriverReplicaSideTest.java
b/modules/replicator/src/integrationTest/java/org/apache/ignite/internal/replicator/ItPlacementDriverReplicaSideTest.java
index d2926be55aa..acebc24cf5b 100644
---
a/modules/replicator/src/integrationTest/java/org/apache/ignite/internal/replicator/ItPlacementDriverReplicaSideTest.java
+++
b/modules/replicator/src/integrationTest/java/org/apache/ignite/internal/replicator/ItPlacementDriverReplicaSideTest.java
@@ -298,7 +298,7 @@ public class ItPlacementDriverReplicaSideTest extends
IgniteAbstractTest {
var res = new HashMap<String, ClusterService>(nodeNames.size());
var nodeFinder = new StaticNodeFinder(IntStream.range(BASE_PORT,
BASE_PORT + 5)
- .mapToObj(p -> new NetworkAddress("localhost", p))
+ .mapToObj(p -> new NetworkAddress("127.0.0.1", p))
.collect(Collectors.toList()));
int port = BASE_PORT;
diff --git
a/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/raft/client/AbstractTopologyAwareGroupServiceTest.java
b/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/raft/client/AbstractTopologyAwareGroupServiceTest.java
index 5f5dad3162e..c0d049ebb51 100644
---
a/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/raft/client/AbstractTopologyAwareGroupServiceTest.java
+++
b/modules/replicator/src/testFixtures/java/org/apache/ignite/internal/raft/client/AbstractTopologyAwareGroupServiceTest.java
@@ -307,7 +307,7 @@ public abstract class AbstractTopologyAwareGroupServiceTest
extends IgniteAbstra
assertNull(leaderRefNoInitialNotify.get());
// Forcing the leader change by stopping the actual leader.
- var addressToStop = new NetworkAddress("localhost",
leader.address().port());
+ var addressToStop = new NetworkAddress(leader.address().host(),
leader.address().port());
var componentContext = new ComponentContext();
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 23767a520f0..c0f35d23b42 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,6 +82,7 @@ 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 ad39ceb7677..eb26638d5b7 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,6 +17,7 @@
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;
@@ -68,18 +69,9 @@ public class ItClientDirectMappingTest extends
ClusterPerClassIntegrationTest {
protected static final int PARTITIONS = 10;
/** Nodes bootstrap configuration pattern. */
- 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 static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
+ " raft.responseTimeoutMillis: 30000,\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 4a1787d9e5e..654ee12ebc1 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,6 +105,7 @@ 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 141ddf8b51f..55b0682e11c 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,6 +21,7 @@ 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;
@@ -55,15 +56,6 @@ 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;
@@ -152,7 +144,7 @@ class ItDuplicateNodeNamesTest extends
BaseIgniteAbstractTest {
private IgniteServer startEmbeddedNode(String nodeName, int nodeIndex, int
nodesCount) {
String config = IgniteStringFormatter.format(
- NODE_BOOTSTRAP_CFG_TEMPLATE,
+ NODE_BOOTSTRAP_CFG_TEMPLATE_WITHOUT_STORAGE_PROFILES,
DEFAULT_BASE_PORT + nodeIndex,
seedAddressesString(nodesCount),
DEFAULT_BASE_CLIENT_PORT + nodeIndex,
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
index a3362dd088c..8f83f5d11a3 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
@@ -368,9 +368,9 @@ public class ItDistributedConfigurationPropertiesTest
extends BaseIgniteAbstract
*/
@BeforeEach
void setUp(@WorkDirectory Path workDir, TestInfo testInfo) throws
Exception {
- var firstNodeAddr = new NetworkAddress("localhost", 10000);
+ var firstNodeAddr = new NetworkAddress("127.0.0.1", 10000);
- var secondNodeAddr = new NetworkAddress("localhost", 10001);
+ var secondNodeAddr = new NetworkAddress("127.0.0.1", 10001);
List<NetworkAddress> allNodes = List.of(firstNodeAddr, secondNodeAddr);
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 9bd9a48701a..343bc0efebf 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,6 +119,7 @@ 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/configuration/storage/ItDistributedConfigurationStorageTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
index 383739ea49c..f45530d4720 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItDistributedConfigurationStorageTest.java
@@ -134,7 +134,7 @@ public class ItDistributedConfigurationStorageTest extends
BaseIgniteAbstractTes
* Constructor that simply creates a subset of components of this node.
*/
Node(TestInfo testInfo, Path workDir) {
- var addr = new NetworkAddress("localhost", 10000);
+ var addr = new NetworkAddress("127.0.0.1", 10000);
vaultManager = new VaultManager(new
PersistentVaultService(workDir.resolve("vault")));
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 f30df3542d6..267c432a81c 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,6 +67,7 @@ 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 0f52f44f22c..4370a91467f 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,6 +57,7 @@ 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 68254a66639..00c8a5b2af6 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,6 +160,7 @@ 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"
@@ -172,6 +173,7 @@ 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"
@@ -194,6 +196,7 @@ 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"
@@ -221,6 +224,7 @@ 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 6384870f222..cd2af11cb95 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,6 +107,7 @@ 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 d8be376ae69..47bcaf85fa8 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,6 +245,7 @@ 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 d4856990a1c..899159b7fb0 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,6 +56,7 @@ 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 5f9b2c571f7..17f44287e94 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,6 +97,7 @@ 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/Cluster.java
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/Cluster.java
index c64d7713942..64b0ec0bfe1 100644
---
a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/Cluster.java
+++
b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/Cluster.java
@@ -406,7 +406,7 @@ public class Cluster {
return IntStream.range(0, seedsCount)
.map(this::port)
- .mapToObj(port -> "\"localhost:" + port + '\"')
+ .mapToObj(port -> "\"127.0.0.1:" + port + '\"')
.collect(joining(", "));
}
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 b2f844d5092..1606a4de88f 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,6 +43,7 @@ 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 0f71c8a27fd..4b1b8695cb2 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 {
- private static final String DEFAULT_PROFILES = ""
+ public 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";
- private static final String FAST_FAILURE_DETECTION = ""
+ public static final String FAST_FAILURE_DETECTION = ""
+ " network.membership: {\n"
+ " membershipSyncIntervalMillis: 1000,\n"
+ " failurePingIntervalMillis: 500,\n"
@@ -73,6 +73,7 @@ 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 47160d66d06..a399cdfb838 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,6 +79,7 @@ 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"
@@ -164,6 +165,7 @@ public class ItSslTest {
@Language("JSON")
String sslEnabledBoostrapConfig = "ignite {\n"
+ " network: {\n"
+ + " listenAddresses: [127.0.0.1],\n"
+ " ssl : {"
+ " enabled: true,\n"
+ " trustStore: {\n"
@@ -421,6 +423,7 @@ 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 04d14234df5..9fa09490c4b 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,10 +17,8 @@
package org.apache.ignite.internal.sql.api;
-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.ConfigTemplates.DEFAULT_PROFILES;
+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.lang.IgniteStringFormatter.format;
@@ -53,22 +51,10 @@ 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
= "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"
- + "}";
+ private static final String NODE_BOOTSTRAP_CFG_TEMPLATE_WITH_EXTRA_PROFILE
= renderConfigTemplate(
+ DEFAULT_PROFILES
+ + "storage.profiles." + EXTRA_PROFILE_NAME + ".engine:
aipersist,\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 af98fb64349..d14524629c2 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,6 +17,7 @@
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;
@@ -38,20 +39,9 @@ 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 = "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 String DATA_NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
+ " nodeAttributes.nodeAttributes: {role: data},\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 2644b79be24..35758d71981 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,6 +176,7 @@ 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/distributed/ReplicasSafeTimePropagationTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicasSafeTimePropagationTest.java
index b9ea5c8cf0b..30452f0b0e6 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicasSafeTimePropagationTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicasSafeTimePropagationTest.java
@@ -115,7 +115,7 @@ public class ReplicasSafeTimePropagationTest extends
IgniteAbstractTest {
private static final StaticNodeFinder NODE_FINDER = new StaticNodeFinder(
IntStream.range(BASE_PORT, BASE_PORT + 5)
- .mapToObj(p -> new NetworkAddress("localhost", p))
+ .mapToObj(p -> new NetworkAddress("127.0.0.1", p))
.collect(Collectors.toList())
);
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 7af3be4746a..438e9dbaacc 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,6 +76,7 @@ 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"
@@ -536,6 +537,7 @@ 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 5bfedc7acf7..62fdc030c09 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,6 +17,8 @@
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;
@@ -42,35 +44,10 @@ 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 =
"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"
- + "}";
+ 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"
+ );
@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 fac22ca1f16..762a91b0f9f 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,6 +18,7 @@
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;
@@ -54,18 +55,9 @@ 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 = "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 static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
+ " raft.responseTimeoutMillis: 30000,\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 a95b6aa0551..fc945179653 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,6 +18,7 @@
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;
@@ -104,18 +105,9 @@ public class ItTxResourcesVacuumTest extends
ClusterPerTestIntegrationTest {
private static final int REPLICAS = 2;
/** Nodes bootstrap configuration pattern. */
- 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 static final String NODE_BOOTSTRAP_CFG_TEMPLATE =
renderConfigTemplate(
+ " raft.responseTimeoutMillis: 30000,\n"
+ );
private final ExecutorService txStateStorageExecutor =
Executors.newSingleThreadExecutor(
IgniteThreadFactory.create("test",
"tx-state-storage-test-pool-itrvt", log, ThreadOperation.STORAGE_READ)
