This is an automated email from the ASF dual-hosted git repository.
ibessonov 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 b9a889ce9b IGNITE-19172 Obsolete TODO comments addressed and removed.
(#1885)
b9a889ce9b is described below
commit b9a889ce9bdae9abc56d34646e829892a4eaf796
Author: Ivan Bessonov <[email protected]>
AuthorDate: Mon Apr 3 15:22:58 2023 +0300
IGNITE-19172 Obsolete TODO comments addressed and removed. (#1885)
---
.../impl/ItMetaStorageManagerImplTest.java | 7 ++-
.../impl/ItMetaStorageMultipleNodesTest.java | 2 +-
.../impl/ItMetaStorageServicePersistenceTest.java | 2 +-
.../metastorage/impl/ItMetaStorageServiceTest.java | 2 +-
.../metastorage/impl/ItMetaStorageWatchTest.java | 2 +-
.../impl/MetaStorageRaftGroupEventsListener.java | 2 +-
.../ignite/network/AbstractClusterService.java | 28 ++++++----
.../ignite/network/ClusterLocalConfiguration.java | 62 ----------------------
.../org/apache/ignite/network/ClusterService.java | 12 +++--
.../scalecube/ItScaleCubeNetworkMessagingTest.java | 6 +--
.../scalecube/ScaleCubeClusterServiceFactory.java | 14 +++--
.../ignite/utils/ClusterServiceTestUtils.java | 34 +++++-------
.../PlacementDriverManagerTest.java | 3 +-
.../ignite/internal/raft/ItLearnersTest.java | 2 +-
.../raft/ItTruncateSuffixAndRestartTest.java | 10 ++--
.../java/org/apache/ignite/internal/raft/Loza.java | 4 +-
.../internal/raft/server/impl/JraftServerImpl.java | 19 +++----
.../raft/jraft/rpc/impl/IgniteRpcServer.java | 2 +-
.../org/apache/ignite/internal/raft/LozaTest.java | 3 +-
.../cluster/ItClusterManagementControllerTest.java | 18 +++----
.../ItDistributedConfigurationPropertiesTest.java | 2 +-
.../ItDistributedConfigurationStorageTest.java | 2 +-
.../storage/ItRebalanceDistributedTest.java | 2 +-
.../runner/app/ItIgniteNodeRestartTest.java | 10 ++--
.../org/apache/ignite/internal/app/IgniteImpl.java | 10 ++--
.../sql/engine/exec/MockedStructuresTest.java | 9 +---
.../engine/framework/ClusterServiceFactory.java | 18 ++++---
.../internal/storage/DataStorageManager.java | 1 -
28 files changed, 107 insertions(+), 181 deletions(-)
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 8952da63d9..f2086852ec 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
@@ -97,10 +97,9 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
ClusterManagementGroupManager cmgManager =
mock(ClusterManagementGroupManager.class);
- when(cmgManager.metaStorageNodes())
-
.thenReturn(completedFuture(Set.of(clusterService.localConfiguration().getName())));
+
when(cmgManager.metaStorageNodes()).thenReturn(completedFuture(Set.of(clusterService.nodeName())));
- storage = new
RocksDbKeyValueStorage(clusterService.localConfiguration().getName(),
workDir.resolve("metastorage"));
+ storage = new RocksDbKeyValueStorage(clusterService.nodeName(),
workDir.resolve("metastorage"));
metaStorageManager = new MetaStorageManagerImpl(
vaultManager,
@@ -259,7 +258,7 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
ClusterManagementGroupManager cmgManager =
mock(ClusterManagementGroupManager.class);
- Set<String> msNodes =
Set.of(clusterService.localConfiguration().getName());
+ Set<String> msNodes = Set.of(clusterService.nodeName());
CompletableFuture<Set<String>> cmgFut = new CompletableFuture<>();
when(cmgManager.metaStorageNodes()).thenReturn(cmgFut);
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesTest.java
index e83bef366e..da41e33025 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesTest.java
@@ -168,7 +168,7 @@ public class ItMetaStorageMultipleNodesTest extends
IgniteAbstractTest {
}
String name() {
- return clusterService.localConfiguration().getName();
+ return clusterService.nodeName();
}
void stop() throws Exception {
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java
index a629716cf6..d34928d647 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServicePersistenceTest.java
@@ -135,7 +135,7 @@ public class ItMetaStorageServicePersistenceTest extends
ItAbstractListenerSnaps
/** {@inheritDoc} */
@Override
public RaftGroupListener createListener(ClusterService service, Path
listenerPersistencePath, int index) {
- String nodeName = service.localConfiguration().getName();
+ String nodeName = service.nodeName();
KeyValueStorage storage = storageByName.computeIfAbsent(nodeName, name
-> {
var s = new RocksDbKeyValueStorage(name, listenerPersistencePath);
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java
index 4b27d01123..8d186f9521 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageServiceTest.java
@@ -210,7 +210,7 @@ public class ItMetaStorageServiceTest {
}
String name() {
- return clusterService.localConfiguration().getName();
+ return clusterService.nodeName();
}
private CompletableFuture<RaftGroupService>
startRaftService(PeersAndLearners configuration) {
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 480ac2ad9b..26dc19a193 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
@@ -157,7 +157,7 @@ public class ItMetaStorageWatchTest extends
IgniteAbstractTest {
}
String name() {
- return clusterService.localConfiguration().getName();
+ return clusterService.nodeName();
}
void stop() throws Exception {
diff --git
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java
index d7b763b3ba..1b55d67271 100644
---
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java
+++
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageRaftGroupEventsListener.java
@@ -73,7 +73,7 @@ public class MetaStorageRaftGroupEventsListener implements
RaftGroupEventsListen
CompletableFuture<MetaStorageServiceImpl> metaStorageSvcFut
) {
this.busyLock = busyLock;
- this.nodeName = clusterService.localConfiguration().getName();
+ this.nodeName = clusterService.nodeName();
this.logicalTopologyService = logicalTopologyService;
this.metaStorageSvcFut = metaStorageSvcFut;
}
diff --git
a/modules/network-api/src/main/java/org/apache/ignite/network/AbstractClusterService.java
b/modules/network-api/src/main/java/org/apache/ignite/network/AbstractClusterService.java
index 74630f83ec..fb4f4a0120 100644
---
a/modules/network-api/src/main/java/org/apache/ignite/network/AbstractClusterService.java
+++
b/modules/network-api/src/main/java/org/apache/ignite/network/AbstractClusterService.java
@@ -17,14 +17,16 @@
package org.apache.ignite.network;
+import org.apache.ignite.network.serialization.MessageSerializationRegistry;
+
/**
* Default implementation of a {@link ClusterService}.
*
* <p>Extending classes should use {@link #start()} and {@link #stop()} to
allocate and free any network-related resources.
*/
public abstract class AbstractClusterService implements ClusterService {
- /** Context. */
- private final ClusterLocalConfiguration context;
+ /** Node name. */
+ private final String nodeName;
/** Topology service. */
private final TopologyService topologyService;
@@ -32,27 +34,30 @@ public abstract class AbstractClusterService implements
ClusterService {
/** Messaging service. */
private final MessagingService messagingService;
+ /** Serialization registry. */
+ private final MessageSerializationRegistry serializationRegistry;
+
/**
* Constructor.
*
- * @param context Cluster context.
* @param topologyService Topology service.
* @param messagingService Messaging service.
*/
public AbstractClusterService(
- ClusterLocalConfiguration context,
+ String nodeName,
TopologyService topologyService,
- MessagingService messagingService
+ MessagingService messagingService,
+ MessageSerializationRegistry serializationRegistry
) {
- this.context = context;
+ this.nodeName = nodeName;
+ this.serializationRegistry = serializationRegistry;
this.topologyService = topologyService;
this.messagingService = messagingService;
}
- /** {@inheritDoc} */
@Override
- public final ClusterLocalConfiguration localConfiguration() {
- return context;
+ public String nodeName() {
+ return nodeName;
}
/** {@inheritDoc} */
@@ -66,4 +71,9 @@ public abstract class AbstractClusterService implements
ClusterService {
public final MessagingService messagingService() {
return messagingService;
}
+
+ @Override
+ public MessageSerializationRegistry serializationRegistry() {
+ return serializationRegistry;
+ }
}
diff --git
a/modules/network-api/src/main/java/org/apache/ignite/network/ClusterLocalConfiguration.java
b/modules/network-api/src/main/java/org/apache/ignite/network/ClusterLocalConfiguration.java
deleted file mode 100644
index 03fd82d7e7..0000000000
---
a/modules/network-api/src/main/java/org/apache/ignite/network/ClusterLocalConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.network;
-
-import org.apache.ignite.network.serialization.MessageSerializationRegistry;
-
-/**
- * Network configuration of a node.
- *
- * <p>TODO: migrate to common configuration class when it's available, see
https://issues.apache.org/jira/browse/IGNITE-14496
- */
-public class ClusterLocalConfiguration {
- /** The network alias of a node. */
- private final String name;
-
- /** Message mapper providers. */
- private final MessageSerializationRegistry serializationRegistry;
-
- /**
- * Constructor.
- *
- * @param name Local name.
- * @param serializationRegistry Message serialization registry.
- */
- public ClusterLocalConfiguration(String name, MessageSerializationRegistry
serializationRegistry) {
- this.name = name;
- this.serializationRegistry = serializationRegistry;
- }
-
- /**
- * Returns the network alias of the node.
- *
- * @return Network alias of a node.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the message serialization registry.
- *
- * @return Message serialization registry.
- */
- public MessageSerializationRegistry getSerializationRegistry() {
- return serializationRegistry;
- }
-}
diff --git
a/modules/network-api/src/main/java/org/apache/ignite/network/ClusterService.java
b/modules/network-api/src/main/java/org/apache/ignite/network/ClusterService.java
index 7f817591f6..0e2dd5b1c1 100644
---
a/modules/network-api/src/main/java/org/apache/ignite/network/ClusterService.java
+++
b/modules/network-api/src/main/java/org/apache/ignite/network/ClusterService.java
@@ -18,12 +18,18 @@
package org.apache.ignite.network;
import org.apache.ignite.internal.manager.IgniteComponent;
+import org.apache.ignite.network.serialization.MessageSerializationRegistry;
/**
* Class, that represents the network-related resources of a node and provides
entry points for working with the network members of a
* cluster.
*/
public interface ClusterService extends IgniteComponent {
+ /**
+ * Returns the network alias of the node.
+ */
+ String nodeName();
+
/**
* Returns the {@link TopologyService} for working with the cluster
topology.
*
@@ -39,11 +45,9 @@ public interface ClusterService extends IgniteComponent {
MessagingService messagingService();
/**
- * Returns the local configuration of this node.
- *
- * @return Configuration of the current node.
+ * Returns the message serialization registry.
*/
- ClusterLocalConfiguration localConfiguration();
+ MessageSerializationRegistry serializationRegistry();
/** {@inheritDoc} */
@Override
diff --git
a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
index be52773cf1..ec177531b7 100644
---
a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
+++
b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/ItScaleCubeNetworkMessagingTest.java
@@ -99,7 +99,7 @@ class ItScaleCubeNetworkMessagingTest {
member.messagingService().addMessageHandler(
TestMessageTypes.class,
(message, sender, correlationId) -> {
-
messageStorage.put(member.localConfiguration().getName(), (TestMessage)
message);
+ messageStorage.put(member.nodeName(), (TestMessage)
message);
messageReceivedLatch.countDown();
}
);
@@ -119,7 +119,7 @@ class ItScaleCubeNetworkMessagingTest {
assertTrue(messagesReceived);
testCluster.members.stream()
- .map(member -> member.localConfiguration().getName())
+ .map(ClusterService::nodeName)
.map(messageStorage::get)
.forEach(msg -> assertThat(msg.msg(), is(testMessage.msg())));
}
@@ -333,7 +333,7 @@ class ItScaleCubeNetworkMessagingTest {
ClusterService alice = testCluster.members.get(0);
ClusterService bob = testCluster.members.get(1);
- String aliceName = alice.localConfiguration().getName();
+ String aliceName = alice.nodeName();
var aliceShutdownLatch = new CountDownLatch(1);
diff --git
a/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
b/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
index ab8b5b8107..c23b656afd 100644
---
a/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
+++
b/modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeClusterServiceFactory.java
@@ -47,7 +47,6 @@ import
org.apache.ignite.internal.network.serialization.UserObjectSerializationC
import
org.apache.ignite.internal.network.serialization.marshal.DefaultUserObjectMarshaller;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.network.AbstractClusterService;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.DefaultMessagingService;
import org.apache.ignite.network.NettyBootstrapFactory;
@@ -55,6 +54,7 @@ import org.apache.ignite.network.NetworkAddress;
import org.apache.ignite.network.NodeFinder;
import org.apache.ignite.network.NodeFinderFactory;
import org.apache.ignite.network.NodeMetadata;
+import org.apache.ignite.network.serialization.MessageSerializationRegistry;
/**
* Cluster service factory that uses ScaleCube for messaging and topology
services.
@@ -69,15 +69,15 @@ public class ScaleCubeClusterServiceFactory {
/**
* Creates a new {@link ClusterService} using the provided context. The
created network will not be in the "started" state.
*
- * @param context Cluster context.
* @param networkConfiguration Network configuration.
* @param nettyBootstrapFactory Bootstrap factory.
* @return New cluster service.
*/
public ClusterService createClusterService(
- ClusterLocalConfiguration context,
+ String consistentId,
NetworkConfiguration networkConfiguration,
- NettyBootstrapFactory nettyBootstrapFactory
+ NettyBootstrapFactory nettyBootstrapFactory,
+ MessageSerializationRegistry serializationRegistry
) {
var messageFactory = new NetworkMessagesFactory();
@@ -92,7 +92,7 @@ public class ScaleCubeClusterServiceFactory {
userObjectSerialization.marshaller()
);
- return new AbstractClusterService(context, topologyService,
messagingService) {
+ return new AbstractClusterService(consistentId, topologyService,
messagingService, serializationRegistry) {
private volatile ClusterImpl cluster;
@@ -103,9 +103,7 @@ public class ScaleCubeClusterServiceFactory {
/** {@inheritDoc} */
@Override
public void start() {
- String consistentId = context.getName();
-
- var serializationService = new
SerializationService(context.getSerializationRegistry(),
userObjectSerialization);
+ var serializationService = new
SerializationService(serializationRegistry, userObjectSerialization);
UUID launchId = UUID.randomUUID();
diff --git
a/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
b/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
index 4b9644e72c..b763d1acfa 100644
---
a/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
+++
b/modules/network/src/testFixtures/java/org/apache/ignite/utils/ClusterServiceTestUtils.java
@@ -31,16 +31,14 @@ import
org.apache.ignite.internal.configuration.storage.TestConfigurationStorage
import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.network.configuration.NodeFinderType;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.network.ClusterLocalConfiguration;
+import org.apache.ignite.network.AbstractClusterService;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.MessageSerializationRegistryImpl;
-import org.apache.ignite.network.MessagingService;
import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.NetworkAddress;
import org.apache.ignite.network.NodeFinder;
import org.apache.ignite.network.NodeMetadata;
import org.apache.ignite.network.StaticNodeFinder;
-import org.apache.ignite.network.TopologyService;
import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
import org.apache.ignite.network.serialization.MessageSerializationRegistry;
import
org.apache.ignite.network.serialization.MessageSerializationRegistryInitializer;
@@ -77,7 +75,7 @@ public class ClusterServiceTestUtils {
* @param nodeFinder Node finder.
*/
public static ClusterService clusterService(TestInfo testInfo, int port,
NodeFinder nodeFinder) {
- var ctx = new ClusterLocalConfiguration(testNodeName(testInfo, port),
defaultSerializationRegistry());
+ String nodeName = testNodeName(testInfo, port);
ConfigurationManager nodeConfigurationMgr = new ConfigurationManager(
Collections.singleton(NetworkConfiguration.KEY),
@@ -89,28 +87,20 @@ public class ClusterServiceTestUtils {
NetworkConfiguration networkConfiguration =
nodeConfigurationMgr.configurationRegistry().getConfiguration(NetworkConfiguration.KEY);
- var bootstrapFactory = new NettyBootstrapFactory(networkConfiguration,
ctx.getName());
+ var bootstrapFactory = new NettyBootstrapFactory(networkConfiguration,
nodeName);
- ClusterService clusterSvc = SERVICE_FACTORY.createClusterService(ctx,
networkConfiguration, bootstrapFactory);
+ MessageSerializationRegistry serializationRegistry =
defaultSerializationRegistry();
- assert nodeFinder instanceof StaticNodeFinder : "Only StaticNodeFinder
is supported at the moment";
-
- return new ClusterService() {
- @Override
- public TopologyService topologyService() {
- return clusterSvc.topologyService();
- }
-
- @Override
- public MessagingService messagingService() {
- return clusterSvc.messagingService();
- }
+ ClusterService clusterSvc = SERVICE_FACTORY.createClusterService(
+ nodeName,
+ networkConfiguration,
+ bootstrapFactory,
+ serializationRegistry
+ );
- @Override
- public ClusterLocalConfiguration localConfiguration() {
- return clusterSvc.localConfiguration();
- }
+ assert nodeFinder instanceof StaticNodeFinder : "Only StaticNodeFinder
is supported at the moment";
+ return new AbstractClusterService(nodeName,
clusterSvc.topologyService(), clusterSvc.messagingService(),
serializationRegistry) {
@Override
public boolean isStopped() {
return clusterSvc.isStopped();
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 e51541619c..3845781c33 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
@@ -129,8 +129,7 @@ public class PlacementDriverManagerTest extends
IgniteAbstractTest {
ClusterManagementGroupManager cmgManager =
mock(ClusterManagementGroupManager.class);
- when(cmgManager.metaStorageNodes())
-
.thenReturn(completedFuture(Set.of(clusterService.localConfiguration().getName())));
+
when(cmgManager.metaStorageNodes()).thenReturn(completedFuture(Set.of(clusterService.nodeName())));
RaftGroupEventsClientListener eventsClientListener = new
RaftGroupEventsClientListener();
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 08bf083e81..c5a8ac7237 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
@@ -106,7 +106,7 @@ public class ItLearnersTest extends IgniteAbstractTest {
RaftNode(ClusterService clusterService) {
this.clusterService = clusterService;
- Path raftDir =
workDir.resolve(clusterService.localConfiguration().getName());
+ Path raftDir = workDir.resolve(clusterService.nodeName());
loza = new Loza(clusterService, raftConfiguration, raftDir, new
HybridClockImpl());
}
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
index 9dc4a9fb32..9eaa98ac06 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/internal/raft/ItTruncateSuffixAndRestartTest.java
@@ -58,7 +58,6 @@ import
org.apache.ignite.internal.replicator.TestReplicationGroupId;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.lang.NodeStoppingException;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
@@ -164,17 +163,16 @@ public class ItTruncateSuffixAndRestartTest {
assertThat(networkConfiguration.port().update(port(i)),
willCompleteSuccessfully());
- var clusterLocalConfiguration = new
ClusterLocalConfiguration(nodeName, defaultSerializationRegistry());
-
- var nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration,
clusterLocalConfiguration.getName());
+ var nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration, nodeName);
nettyBootstrapFactory.start();
cleanup.add(nettyBootstrapFactory::stop);
clusterSvc = new
TestScaleCubeClusterServiceFactory().createClusterService(
- clusterLocalConfiguration,
+ nodeName,
networkConfiguration,
- nettyBootstrapFactory
+ nettyBootstrapFactory,
+ defaultSerializationRegistry()
);
clusterSvc.start();
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
index cde94c987a..4c1abcefe3 100644
--- a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
+++ b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
@@ -116,9 +116,7 @@ public class Loza implements RaftManager {
this.raftServer = new JraftServerImpl(clusterNetSvc, dataPath,
options, raftGroupEventsClientListener);
this.executor = new ScheduledThreadPoolExecutor(CLIENT_POOL_SIZE,
- new
NamedThreadFactory(NamedThreadFactory.threadPrefix(clusterNetSvc.localConfiguration().getName(),
- CLIENT_POOL_NAME), LOG
- )
+ new
NamedThreadFactory(NamedThreadFactory.threadPrefix(clusterNetSvc.nodeName(),
CLIENT_POOL_NAME), LOG)
);
}
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
index 58fe7ec69b..6e26c4461f 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
@@ -164,7 +164,7 @@ public class JraftServerImpl implements RaftServer {
this.opts.setSharedPools(true);
if (opts.getServerName() == null) {
- this.opts.setServerName(service.localConfiguration().getName());
+ this.opts.setServerName(service.nodeName());
}
/*
@@ -187,7 +187,7 @@ public class JraftServerImpl implements RaftServer {
startGroupInProgressMonitors = Collections.unmodifiableList(monitors);
- commandsMarshaller = new
ThreadLocalOptimizedMarshaller(service.localConfiguration().getSerializationRegistry());
+ commandsMarshaller = new
ThreadLocalOptimizedMarshaller(service.serializationRegistry());
serviceEventInterceptor = new RaftServiceEventInterceptor();
}
@@ -397,17 +397,18 @@ public class JraftServerImpl implements RaftServer {
// Thread pools are shared by all raft groups.
NodeOptions nodeOptions = opts.copy();
- // TODO: IGNITE-17083 - Do not create paths for volatile stores at
all when we get rid of snapshot storage on FS.
+ nodeOptions.setLogUri(nodeIdStr(nodeId));
+
Path serverDataPath = getServerDataPath(nodeId);
- try {
- Files.createDirectories(serverDataPath);
- } catch (IOException e) {
- throw new IgniteInternalException(e);
+ if (!groupOptions.volatileStores()) {
+ try {
+ Files.createDirectories(serverDataPath);
+ } catch (IOException e) {
+ throw new IgniteInternalException(e);
+ }
}
- nodeOptions.setLogUri(nodeIdStr(nodeId));
-
nodeOptions.setRaftMetaUri(serverDataPath.resolve("meta").toString());
nodeOptions.setSnapshotUri(serverDataPath.resolve("snapshot").toString());
diff --git
a/modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/IgniteRpcServer.java
b/modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/IgniteRpcServer.java
index 574dc1262f..db2bef212e 100644
---
a/modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/IgniteRpcServer.java
+++
b/modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/IgniteRpcServer.java
@@ -120,7 +120,7 @@ public class IgniteRpcServer implements RpcServer<Void> {
registerProcessor(new RemoveLearnersRequestProcessor(rpcExecutor,
raftMessagesFactory));
registerProcessor(new ResetLearnersRequestProcessor(rpcExecutor,
raftMessagesFactory));
// common client integration
- var commandsMarshaller = new
ThreadLocalOptimizedMarshaller(service.localConfiguration().getSerializationRegistry());
+ var commandsMarshaller = new
ThreadLocalOptimizedMarshaller(service.serializationRegistry());
registerProcessor(new ActionRequestProcessor(rpcExecutor,
raftMessagesFactory, commandsMarshaller));
registerProcessor(new NotifyElectProcessor(raftMessagesFactory,
serviceEventInterceptor));
registerProcessor(new
RaftGroupEventsProcessor(raftGroupEventsClientListener));
diff --git
a/modules/raft/src/test/java/org/apache/ignite/internal/raft/LozaTest.java
b/modules/raft/src/test/java/org/apache/ignite/internal/raft/LozaTest.java
index 9811330410..5b74fd6f96 100644
--- a/modules/raft/src/test/java/org/apache/ignite/internal/raft/LozaTest.java
+++ b/modules/raft/src/test/java/org/apache/ignite/internal/raft/LozaTest.java
@@ -28,7 +28,6 @@ import
org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.replicator.TestReplicationGroupId;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.lang.NodeStoppingException;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.MessagingService;
import org.apache.ignite.network.TopologyService;
@@ -60,7 +59,7 @@ public class LozaTest extends IgniteAbstractTest {
*/
@Test
public void testLozaStop() throws Exception {
- Mockito.doReturn(new ClusterLocalConfiguration("test_node",
null)).when(clusterNetSvc).localConfiguration();
+ Mockito.doReturn("test_node").when(clusterNetSvc).nodeName();
Mockito.doReturn(mock(MessagingService.class)).when(clusterNetSvc).messagingService();
Mockito.doReturn(mock(TopologyService.class)).when(clusterNetSvc).topologyService();
diff --git
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
index 3441e86fb7..a52055e9eb 100644
---
a/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
+++
b/modules/rest/src/integrationTest/java/org/apache/ignite/internal/rest/cluster/ItClusterManagementControllerTest.java
@@ -88,7 +88,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
void testInitEnabledAuthEmptyProviders() {
String givenInvalidBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\""
+ + " \"" + cluster.get(0).clusterService().nodeName() + "\""
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -111,7 +111,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
void testInitEnabledAuthEmptyLogin() {
String givenInvalidBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\""
+ + " \"" + cluster.get(0).clusterService().nodeName() + "\""
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -141,7 +141,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
void testInitEnabledAuthEmptyPassword() {
String givenInvalidBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\""
+ + " \"" + cluster.get(0).clusterService().nodeName() + "\""
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -171,7 +171,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
void testInitEnabledAuthEmptyType() {
String givenInvalidBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\""
+ + " \"" + cluster.get(0).clusterService().nodeName() + "\""
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -201,7 +201,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
void testInitEnabledAuthEmptyName() {
String givenInvalidBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\""
+ + " \"" + cluster.get(0).clusterService().nodeName() + "\""
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -243,7 +243,7 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
// Given cluster initialized
String givenFirstRequestBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(0).clusterService().localConfiguration().getName() + "\"\n"
+ + " \"" + cluster.get(0).clusterService().nodeName() +
"\"\n"
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
@@ -265,14 +265,14 @@ public class ItClusterManagementControllerTest extends
RestTestBase {
client.toBlocking().retrieve("state", ClusterStateDto.class);
// Then cluster state is valid
- assertThat(state.msNodes(),
is(equalTo(List.of(cluster.get(0).clusterService().localConfiguration().getName()))));
- assertThat(state.cmgNodes(),
is(equalTo(List.of(cluster.get(0).clusterService().localConfiguration().getName()))));
+ assertThat(state.msNodes(),
is(equalTo(List.of(cluster.get(0).clusterService().nodeName()))));
+ assertThat(state.cmgNodes(),
is(equalTo(List.of(cluster.get(0).clusterService().nodeName()))));
assertThat(state.clusterTag().clusterName(), is(equalTo("cluster")));
// Given second request with different node name
String givenSecondRequestBody = "{\n"
+ " \"metaStorageNodes\": [\n"
- + " \"" +
cluster.get(1).clusterService().localConfiguration().getName() + "\"\n"
+ + " \"" + cluster.get(1).clusterService().nodeName() +
"\"\n"
+ " ],\n"
+ " \"cmgNodes\": [],\n"
+ " \"clusterName\": \"cluster\",\n"
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 4ef5394f4f..4062696b7c 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
@@ -249,7 +249,7 @@ public class ItDistributedConfigurationPropertiesTest {
}
String name() {
- return clusterService.localConfiguration().getName();
+ return clusterService.nodeName();
}
}
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 c714e7269c..a7609a5967 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
@@ -184,7 +184,7 @@ public class ItDistributedConfigurationStorageTest {
}
String name() {
- return clusterService.localConfiguration().getName();
+ return clusterService.nodeName();
}
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index 7fbab6d840..5ef05eefd7 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
@@ -653,7 +653,7 @@ public class ItRebalanceDistributedTest {
nodeAttributes
);
- String nodeName = clusterService.localConfiguration().getName();
+ String nodeName = clusterService.nodeName();
metaStorageManager = new MetaStorageManagerImpl(
vaultManager,
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 b4ad6419c8..a338b6b790 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
@@ -121,7 +121,6 @@ import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.IgniteStringFormatter;
import org.apache.ignite.lang.IgniteSystemProperties;
import org.apache.ignite.lang.NodeStoppingException;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
import org.apache.ignite.raft.jraft.rpc.impl.RaftGroupEventsClientListener;
@@ -270,14 +269,13 @@ public class ItIgniteNodeRestartTest extends
IgniteAbstractTest {
NetworkConfiguration networkConfiguration =
nodeCfgMgr.configurationRegistry().getConfiguration(NetworkConfiguration.KEY);
- var clusterLocalConfiguration = new ClusterLocalConfiguration(name,
defaultSerializationRegistry());
-
- var nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration,
clusterLocalConfiguration.getName());
+ var nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration, name);
var clusterSvc = new
TestScaleCubeClusterServiceFactory().createClusterService(
- clusterLocalConfiguration,
+ name,
networkConfiguration,
- nettyBootstrapFactory
+ nettyBootstrapFactory,
+ defaultSerializationRegistry()
);
HybridClock hybridClock = new HybridClockImpl();
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 e2f1e6a94e..2e292d4f46 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
@@ -126,7 +126,6 @@ import
org.apache.ignite.internal.vault.persistence.PersistentVaultService;
import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.NodeStoppingException;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.DefaultMessagingService;
@@ -309,14 +308,13 @@ public class IgniteImpl implements Ignite {
MessageSerializationRegistry serializationRegistry =
createSerializationRegistry(serviceProviderClassLoader);
- var clusterLocalConfiguration = new ClusterLocalConfiguration(name,
serializationRegistry);
-
- nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration,
clusterLocalConfiguration.getName());
+ nettyBootstrapFactory = new
NettyBootstrapFactory(networkConfiguration, name);
clusterSvc = new ScaleCubeClusterServiceFactory().createClusterService(
- clusterLocalConfiguration,
+ name,
networkConfiguration,
- nettyBootstrapFactory
+ nettyBootstrapFactory,
+ serializationRegistry
);
computeComponent = new ComputeComponentImpl(
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
index feac7aacb3..cba8022747 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
@@ -92,7 +92,6 @@ import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.lang.TableAlreadyExistsException;
import org.apache.ignite.lang.TableNotFoundException;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.MessagingService;
@@ -528,13 +527,7 @@ public class MockedStructuresTest extends
IgniteAbstractTest {
return ret;
});
- when(cs.localConfiguration()).thenAnswer(invocation -> {
- ClusterLocalConfiguration ret =
mock(ClusterLocalConfiguration.class);
-
- when(ret.getName()).thenReturn("node1");
-
- return ret;
- });
+ when(cs.nodeName()).thenAnswer(invocation -> "node1");
when(cs.topologyService()).thenAnswer(invocation -> {
TopologyService ret = mock(TopologyService.class);
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ClusterServiceFactory.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ClusterServiceFactory.java
index 4e6b0caaed..6873f74b37 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ClusterServiceFactory.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/ClusterServiceFactory.java
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
import org.apache.ignite.network.AbstractMessagingService;
import org.apache.ignite.network.AbstractTopologyService;
import org.apache.ignite.network.ChannelType;
-import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.MessagingService;
@@ -38,6 +37,7 @@ import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.NetworkMessageHandler;
import org.apache.ignite.network.NodeMetadata;
import org.apache.ignite.network.TopologyService;
+import org.apache.ignite.network.serialization.MessageSerializationRegistry;
import org.jetbrains.annotations.Nullable;
/**
@@ -67,6 +67,11 @@ public class ClusterServiceFactory {
*/
public ClusterService forNode(String nodeName) {
return new ClusterService() {
+ @Override
+ public String nodeName() {
+ throw new AssertionError("Should not be called");
+ }
+
/** {@inheritDoc} */
@Override
public TopologyService topologyService() {
@@ -79,12 +84,6 @@ public class ClusterServiceFactory {
return messagingServicesByNode.computeIfAbsent(nodeName,
LocalMessagingService::new);
}
- /** {@inheritDoc} */
- @Override
- public ClusterLocalConfiguration localConfiguration() {
- throw new AssertionError("Should not be called");
- }
-
/** {@inheritDoc} */
@Override
public boolean isStopped() {
@@ -97,6 +96,11 @@ public class ClusterServiceFactory {
throw new AssertionError("Should not be called");
}
+ @Override
+ public MessageSerializationRegistry serializationRegistry() {
+ throw new AssertionError("Should not be called");
+ }
+
/** {@inheritDoc} */
@Override
public void start() {
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
index 945b34c3a1..ce7038c620 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageManager.java
@@ -95,7 +95,6 @@ public class DataStorageManager implements IgniteComponent {
* UnknownDataStorageConfigurationSchema#UNKNOWN_DATA_STORAGE} and
there is only one engine, then it will be the default, otherwise
* there will be no default.
*/
- // TODO: IGNITE-16835 Remove it.
public Consumer<DataStorageChange> defaultTableDataStorageConsumer(String
defaultDataStorageView) {
return tableDataStorageChange -> {
if (!defaultDataStorageView.equals(UNKNOWN_DATA_STORAGE)) {
