This is an automated email from the ASF dual-hosted git repository.
sk0x50 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 a7d6f016dd9 IGNITE-27076 Remove code related to non-colocated case
(cluster management module) (#7024)
a7d6f016dd9 is described below
commit a7d6f016dd9da00b58cadfae4e2dfbadc84a53e3
Author: Slava Koptilin <[email protected]>
AuthorDate: Fri Nov 21 11:29:05 2025 +0200
IGNITE-27076 Remove code related to non-colocated case (cluster management
module) (#7024)
---
.../cluster/management/ItClusterManagerTest.java | 28 +++++-----------
.../cluster/management/ClusterInitializer.java | 9 ++---
.../management/ClusterManagementGroupManager.java | 19 +++--------
.../cluster/management/ClusterInitializerTest.java | 4 +--
.../management/BaseItClusterManagementTest.java | 20 ++++++++++++
.../internal/cluster/management/MockNode.java | 38 ++++++++++++++++++----
.../components/SystemPropertiesNodeProperties.java | 1 +
.../rebalance/ItRebalanceDistributedTest.java | 3 +-
.../ItMetaStorageMultipleNodesAbstractTest.java | 4 +--
.../metastorage/impl/ItMetaStorageWatchTest.java | 4 +--
.../partition/replicator/fixtures/Node.java | 4 +--
.../ItDistributedConfigurationPropertiesTest.java | 4 +--
.../ItDistributedConfigurationStorageTest.java | 4 +--
.../runner/app/ItIgniteNodeRestartTest.java | 4 +--
.../org/apache/ignite/internal/app/IgniteImpl.java | 6 ++--
15 files changed, 76 insertions(+), 76 deletions(-)
diff --git
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterManagerTest.java
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterManagerTest.java
index a5cea4cc7af..1b8123071fa 100644
---
a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterManagerTest.java
+++
b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItClusterManagerTest.java
@@ -60,7 +60,7 @@ import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.raft.jraft.rpc.CliRequests.ResetLearnersRequest;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -71,22 +71,9 @@ import org.junit.jupiter.params.provider.ValueSource;
public class ItClusterManagerTest extends BaseItClusterManagementTest {
private final List<MockNode> cluster = new ArrayList<>();
- private String commonColocationFeatureFlag;
-
- @BeforeEach
- public void setUp() {
- commonColocationFeatureFlag =
System.getProperty(COLOCATION_FEATURE_FLAG);
- }
-
@AfterEach
void tearDown() throws Exception {
stopCluster();
-
- if (commonColocationFeatureFlag == null) {
- System.clearProperty(COLOCATION_FEATURE_FLAG);
- } else {
- System.setProperty(COLOCATION_FEATURE_FLAG,
commonColocationFeatureFlag);
- }
}
private void startCluster(int numNodes, BiConsumer<Integer,
RaftGroupConfiguration> onConfigurationCommittedListener) {
@@ -748,6 +735,7 @@ public class ItClusterManagerTest extends
BaseItClusterManagementTest {
}
@SuppressWarnings("ThrowableNotThrown")
+ @Disabled("https://issues.apache.org/jira/browse/IGNITE-27071";)
@ParameterizedTest
@ValueSource(booleans = {true, false})
void testInitFailsOnDifferentEnabledColocationModesWithinCmgNodes(boolean
colocationEnabled) {
@@ -771,17 +759,17 @@ public class ItClusterManagerTest extends
BaseItClusterManagementTest {
@Test
void testJoinFailsOnDifferentEnabledColocationModesWithinCmgNodes() throws
Exception {
- final boolean colocationEnabled = true;
-
- System.setProperty(COLOCATION_FEATURE_FLAG,
Boolean.toString(colocationEnabled));
startCluster(1);
String[] cmgNodes = clusterNodeNames();
initCluster(cmgNodes, cmgNodes);
- System.setProperty(COLOCATION_FEATURE_FLAG,
Boolean.toString(!colocationEnabled));
+ // TODO https://issues.apache.org/jira/browse/IGNITE-27071
+ // Perhaps, this test should be re-worked along with
testInitFailsOnDifferentEnabledColocationModesWithinCmgNodes
+ MockNode secondNode = createNode(
+ cluster.size(), cluster.size(), config -> {}, () ->
Map.of(COLOCATION_FEATURE_FLAG, Boolean.FALSE.toString()));
- MockNode secondNode = addNodeToCluster(cluster);
+ cluster.add(secondNode);
secondNode.startAndJoin();
@@ -789,7 +777,7 @@ public class ItClusterManagerTest extends
BaseItClusterManagementTest {
() -> secondNode.startFuture().get(),
InvalidNodeConfigurationException.class,
IgniteStringFormatter.format("Colocation enabled mode does not
match. Joining node colocation mode is: {},"
- + " cluster colocation mode is: {}",
!colocationEnabled, colocationEnabled)
+ + " cluster colocation mode is: {}", false, true)
);
}
}
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterInitializer.java
b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterInitializer.java
index 1ee03e0d008..3393e5c8594 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterInitializer.java
+++
b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterInitializer.java
@@ -41,7 +41,6 @@ import
org.apache.ignite.internal.cluster.management.network.messages.CmgPrepare
import
org.apache.ignite.internal.cluster.management.network.messages.InitCompleteMessage;
import
org.apache.ignite.internal.cluster.management.network.messages.InitErrorMessage;
import
org.apache.ignite.internal.cluster.management.network.messages.PrepareInitCompleteMessage;
-import org.apache.ignite.internal.components.NodeProperties;
import
org.apache.ignite.internal.configuration.validation.ConfigurationDuplicatesValidator;
import
org.apache.ignite.internal.configuration.validation.ConfigurationValidator;
import org.apache.ignite.internal.logger.IgniteLogger;
@@ -69,19 +68,15 @@ public class ClusterInitializer {
private final CmgMessagesFactory msgFactory = new CmgMessagesFactory();
- private final NodeProperties nodeProperties;
-
/** Constructor. */
public ClusterInitializer(
ClusterService clusterService,
ConfigurationDynamicDefaultsPatcher
configurationDynamicDefaultsPatcher,
- ConfigurationValidator clusterConfigurationValidator,
- NodeProperties nodeProperties
+ ConfigurationValidator clusterConfigurationValidator
) {
this.clusterService = clusterService;
this.configurationDynamicDefaultsPatcher =
configurationDynamicDefaultsPatcher;
this.clusterConfigurationValidator = clusterConfigurationValidator;
- this.nodeProperties = nodeProperties;
}
/**
@@ -193,7 +188,7 @@ public class ClusterInitializer {
validateConfiguration(patchedClusterConfiguration,
clusterConfiguration);
CmgPrepareInitMessage prepareInitMessage =
msgFactory.cmgPrepareInitMessage()
-
.initInitiatorColocationEnabled(nodeProperties.colocationEnabled())
+ .initInitiatorColocationEnabled(true)
.build();
CmgInitMessage initMessage = msgFactory.cmgInitMessage()
diff --git
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java
b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java
index 7d6b1537217..33a683bf731 100644
---
a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java
+++
b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java
@@ -70,8 +70,6 @@ import
org.apache.ignite.internal.cluster.management.raft.commands.JoinReadyComm
import org.apache.ignite.internal.cluster.management.topology.LogicalTopology;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
-import org.apache.ignite.internal.components.NodeProperties;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.disaster.system.message.ResetClusterMessage;
import org.apache.ignite.internal.disaster.system.storage.ClusterResetStorage;
import org.apache.ignite.internal.event.AbstractEventProducer;
@@ -190,8 +188,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
private final LocalTopologyMetricsSource localTopologyMetricsSource;
- private final NodeProperties nodeProperties;
-
private final Consumer<RaftGroupConfiguration>
onConfigurationCommittedListener;
/** Constructor. */
@@ -208,8 +204,7 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
FailureProcessor failureProcessor,
ClusterIdStore clusterIdStore,
RaftGroupOptionsConfigurer raftGroupOptionsConfigurer,
- MetricManager metricManager,
- NodeProperties nodeProperties
+ MetricManager metricManager
) {
this(
vault,
@@ -225,7 +220,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
clusterIdStore,
raftGroupOptionsConfigurer,
metricManager,
- nodeProperties,
config -> {}
);
}
@@ -245,7 +239,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
ClusterIdStore clusterIdStore,
RaftGroupOptionsConfigurer raftGroupOptionsConfigurer,
MetricManager metricManager,
- NodeProperties nodeProperties,
Consumer<RaftGroupConfiguration> onConfigurationCommittedListener
) {
this.clusterResetStorage = clusterResetStorage;
@@ -281,7 +274,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
clusterService.messagingService().addMessageHandler(CmgMessageGroup.class,
message -> scheduledExecutor, cmgMessageHandler);
- this.nodeProperties = nodeProperties;
this.onConfigurationCommittedListener =
onConfigurationCommittedListener;
}
@@ -359,8 +351,7 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
failureProcessor,
clusterIdStore,
raftGroupOptionsConfigurer,
- metricManager,
- new SystemPropertiesNodeProperties()
+ metricManager
);
}
@@ -379,7 +370,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
ClusterIdStore clusterIdStore,
RaftGroupOptionsConfigurer raftGroupOptionsConfigurer,
MetricManager metricManager,
- NodeProperties nodeProperties,
Consumer<RaftGroupConfiguration> onConfigurationCommittedListener
) {
this(
@@ -396,7 +386,6 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
clusterIdStore,
raftGroupOptionsConfigurer,
metricManager,
- nodeProperties,
onConfigurationCommittedListener
);
}
@@ -678,13 +667,13 @@ public class ClusterManagementGroupManager extends
AbstractEventProducer<Cluster
msg.initInitiatorColocationEnabled());
NetworkMessage response;
- if (nodeProperties.colocationEnabled() !=
msg.initInitiatorColocationEnabled()) {
+ if (!msg.initInitiatorColocationEnabled()) {
String colocationEnabledMismatchResponseMessage =
IgniteStringFormatter.format(
"Colocation modes do not match [initInitiatorNodeName={},
initInitiatorColocationMode={}, "
+ "recipientColocationMode={}].",
sender.name(),
msg.initInitiatorColocationEnabled(),
- nodeProperties.colocationEnabled()
+ Boolean.TRUE
);
response =
preparePhaseInitErrorMessage(colocationEnabledMismatchResponseMessage);
diff --git
a/modules/cluster-management/src/test/java/org/apache/ignite/internal/cluster/management/ClusterInitializerTest.java
b/modules/cluster-management/src/test/java/org/apache/ignite/internal/cluster/management/ClusterInitializerTest.java
index 7b9aa5a0213..8de8eeddf7f 100644
---
a/modules/cluster-management/src/test/java/org/apache/ignite/internal/cluster/management/ClusterInitializerTest.java
+++
b/modules/cluster-management/src/test/java/org/apache/ignite/internal/cluster/management/ClusterInitializerTest.java
@@ -43,7 +43,6 @@ import
org.apache.ignite.internal.cluster.management.network.messages.CancelInit
import
org.apache.ignite.internal.cluster.management.network.messages.CmgInitMessage;
import
org.apache.ignite.internal.cluster.management.network.messages.CmgMessagesFactory;
import
org.apache.ignite.internal.cluster.management.network.messages.CmgPrepareInitMessage;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import
org.apache.ignite.internal.configuration.validation.TestConfigurationValidator;
import org.apache.ignite.internal.network.ChannelType;
import org.apache.ignite.internal.network.ClusterNodeImpl;
@@ -88,8 +87,7 @@ public class ClusterInitializerTest extends
BaseIgniteAbstractTest {
clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
}
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 4d61e6d5d7a..0d5d7066dc3 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
@@ -116,6 +116,26 @@ public abstract class BaseItClusterManagementTest extends
IgniteAbstractTest {
);
}
+ protected MockNode createNode(
+ int idx,
+ int clusterSize,
+ Consumer<RaftGroupConfiguration> onConfigurationCommittedListener,
+ NodeAttributesProvider attributesProvider
+ ) {
+ return new MockNode(
+ testInfo,
+ new NetworkAddress("localhost", PORT_BASE + idx),
+ new StaticNodeFinder(createSeedAddresses(clusterSize)),
+ workDir,
+ raftConfiguration,
+ systemLocalConfiguration,
+ userNodeAttributes,
+ attributesProvider,
+ storageConfiguration,
+ onConfigurationCommittedListener
+ );
+ }
+
protected static void stopNodes(Collection<MockNode> nodes) throws
Exception {
closeAll(nodes.parallelStream().map(node -> node::beforeNodeStop));
closeAll(nodes.parallelStream().map(node -> node::stop));
diff --git
a/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
index 2d96b8dfd2b..cc48f22fb48 100644
---
a/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
+++
b/modules/cluster-management/src/testFixtures/java/org/apache/ignite/internal/cluster/management/MockNode.java
@@ -45,7 +45,6 @@ import
org.apache.ignite.internal.disaster.system.SystemDisasterRecoveryStorage;
import org.apache.ignite.internal.failure.FailureManager;
import org.apache.ignite.internal.failure.NoOpFailureManager;
import org.apache.ignite.internal.hlc.HybridClockImpl;
-import org.apache.ignite.internal.lang.IgniteSystemProperties;
import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.metrics.NoOpMetricManager;
@@ -94,6 +93,35 @@ public class MockNode {
NodeAttributesConfiguration nodeAttributes,
StorageConfiguration storageProfilesConfiguration,
Consumer<RaftGroupConfiguration> onConfigurationCommittedListener
+ ) {
+ this(
+ testInfo,
+ addr,
+ nodeFinder,
+ workDir,
+ raftConfiguration,
+ systemLocalConfiguration,
+ nodeAttributes,
+ () -> Map.of(COLOCATION_FEATURE_FLAG, Boolean.TRUE.toString()),
+ storageProfilesConfiguration,
+ onConfigurationCommittedListener
+ );
+ }
+
+ /**
+ * Fake node constructor.
+ */
+ public MockNode(
+ TestInfo testInfo,
+ NetworkAddress addr,
+ NodeFinder nodeFinder,
+ Path workDir,
+ RaftConfiguration raftConfiguration,
+ SystemLocalConfiguration systemLocalConfiguration,
+ NodeAttributesConfiguration nodeAttributes,
+ NodeAttributesProvider attributesProvider,
+ StorageConfiguration storageProfilesConfiguration,
+ Consumer<RaftGroupConfiguration> onConfigurationCommittedListener
) {
String nodeName = testNodeName(testInfo, addr.port());
@@ -133,11 +161,9 @@ public class MockNode {
RaftGroupOptionsConfigurer cmgRaftConfigurer =
RaftGroupOptionsConfigHelper.configureProperties(cmgLogStorageFactory,
this.workDir.resolve("cmg/meta"));
- boolean colocationEnabled = IgniteSystemProperties.colocationEnabled();
-
var collector = new NodeAttributesCollector(nodeAttributes,
storageProfilesConfiguration);
- collector.register(() -> Map.of(COLOCATION_FEATURE_FLAG,
Boolean.toString(colocationEnabled)));
+ collector.register(attributesProvider);
this.clusterManager = new ClusterManagementGroupManager(
vaultManager,
@@ -146,8 +172,7 @@ public class MockNode {
new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- () -> colocationEnabled
+ new TestConfigurationValidator()
),
raftManager,
clusterStateStorage,
@@ -157,7 +182,6 @@ public class MockNode {
clusterIdHolder,
cmgRaftConfigurer,
new NoOpMetricManager(),
- () -> colocationEnabled,
onConfigurationCommittedListener
);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/components/SystemPropertiesNodeProperties.java
b/modules/core/src/main/java/org/apache/ignite/internal/components/SystemPropertiesNodeProperties.java
index d17e7aedbfa..e68b1ef2bb3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/components/SystemPropertiesNodeProperties.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/components/SystemPropertiesNodeProperties.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.TestOnly;
*
* <p>Should only be used for tests.
*/
+// TODO https://issues.apache.org/jira/browse/IGNITE-22522 Consider to remove
this class and its usages.
@TestOnly
public class SystemPropertiesNodeProperties implements NodeProperties {
@Override
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 99be4eeef29..89c4aaabb63 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -1315,8 +1315,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = cmgPath(systemConfiguration, dir);
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 a395f6a470a..67052daf102 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
@@ -40,7 +40,6 @@ import
org.apache.ignite.internal.cluster.management.raft.ClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.configuration.ComponentWorkingDir;
import org.apache.ignite.internal.configuration.RaftGroupOptionsConfigHelper;
import org.apache.ignite.internal.configuration.SystemDistributedConfiguration;
@@ -177,8 +176,7 @@ abstract class ItMetaStorageMultipleNodesAbstractTest
extends IgniteAbstractTest
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = new
ComponentWorkingDir(basePath.resolve("cmg"));
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageWatchTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageWatchTest.java
index b0d41642081..51cbc51ebde 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageWatchTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageWatchTest.java
@@ -57,7 +57,6 @@ import
org.apache.ignite.internal.cluster.management.configuration.NodeAttribute
import
org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.configuration.ComponentWorkingDir;
import org.apache.ignite.internal.configuration.RaftGroupOptionsConfigHelper;
import org.apache.ignite.internal.configuration.SystemDistributedConfiguration;
@@ -187,8 +186,7 @@ public class ItMetaStorageWatchTest extends
IgniteAbstractTest {
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
components.add(failureManager);
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
index 082f995d7c6..101a6a2e1b1 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
@@ -67,7 +67,6 @@ import
org.apache.ignite.internal.cluster.management.configuration.NodeAttribute
import
org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.configuration.ClusterConfiguration;
import org.apache.ignite.internal.configuration.ComponentWorkingDir;
import org.apache.ignite.internal.configuration.ConfigurationManager;
@@ -416,8 +415,7 @@ public class Node {
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = new
ComponentWorkingDir(dir.resolve("cmg"));
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 b831248b2b7..78257bb01b3 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
@@ -48,7 +48,6 @@ import
org.apache.ignite.internal.cluster.management.configuration.NodeAttribute
import
org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import
org.apache.ignite.internal.configuration.storage.ConfigurationStorageListener;
import
org.apache.ignite.internal.configuration.storage.DistributedConfigurationStorage;
import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
@@ -198,8 +197,7 @@ public class ItDistributedConfigurationPropertiesTest
extends BaseIgniteAbstract
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = new
ComponentWorkingDir(workDir.resolve("cmg"));
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 f7802e86a12..6cf0687d56b 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
@@ -40,7 +40,6 @@ import
org.apache.ignite.internal.cluster.management.configuration.NodeAttribute
import
org.apache.ignite.internal.cluster.management.raft.TestClusterStateStorage;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.configuration.ComponentWorkingDir;
import org.apache.ignite.internal.configuration.RaftGroupOptionsConfigHelper;
import org.apache.ignite.internal.configuration.SystemDistributedConfiguration;
@@ -172,8 +171,7 @@ public class ItDistributedConfigurationStorageTest extends
BaseIgniteAbstractTes
var clusterInitializer = new ClusterInitializer(
clusterService,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = new
ComponentWorkingDir(workDir.resolve("cmg"));
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 80d75a40e63..b43eeed3986 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -105,7 +105,6 @@ import
org.apache.ignite.internal.cluster.management.raft.RocksDbClusterStateSto
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyImpl;
import
org.apache.ignite.internal.cluster.management.topology.LogicalTopologyServiceImpl;
import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode;
-import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.configuration.ComponentWorkingDir;
import org.apache.ignite.internal.configuration.ConfigurationManager;
import org.apache.ignite.internal.configuration.ConfigurationModules;
@@ -432,8 +431,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
var clusterInitializer = new ClusterInitializer(
clusterSvc,
hocon -> hocon,
- new TestConfigurationValidator(),
- new SystemPropertiesNodeProperties()
+ new TestConfigurationValidator()
);
ComponentWorkingDir cmgWorkDir = new
ComponentWorkingDir(workDir.resolve("cmg"));
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 812f08b3750..c5200c53d69 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -721,8 +721,7 @@ public class IgniteImpl implements Ignite {
clusterInitializer = new ClusterInitializer(
clusterSvc,
clusterCfgDynamicDefaultsPatcher,
- distributedCfgValidator,
- nodeProperties
+ distributedCfgValidator
);
NodeAttributesCollector nodeAttributesCollector =
@@ -750,8 +749,7 @@ public class IgniteImpl implements Ignite {
failureManager,
clusterIdService,
cmgRaftConfigurer,
- metricManager,
- nodeProperties
+ metricManager
);
logicalTopologyService = new
LogicalTopologyServiceImpl(logicalTopology, cmgMgr);
