valepakh commented on code in PR #5255: URL: https://github.com/apache/ignite-3/pull/5255#discussion_r1979573430
########## modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodesTest.java: ########## @@ -0,0 +1,172 @@ +/* + * 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.internal.cluster.management; + +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.testframework.IgniteTestUtils.shortTestMethodName; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowWithCauseOrSuppressed; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +import java.lang.reflect.Method; +import java.nio.file.Path; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.IntStream; +import org.apache.ignite.IgniteServer; +import org.apache.ignite.InitParameters; +import org.apache.ignite.internal.app.IgniteServerImpl; +import org.apache.ignite.internal.lang.IgniteStringFormatter; +import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; +import org.apache.ignite.internal.testframework.TestIgnitionManager; +import org.apache.ignite.internal.testframework.WorkDirectory; +import org.apache.ignite.internal.testframework.WorkDirectoryExtension; +import org.apache.ignite.network.ClusterNode; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.extension.ExtendWith; + +@ExtendWith(WorkDirectoryExtension.class) +class ItDuplicateNodesTest 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; + + private final Map<Integer, IgniteServer> servers = new HashMap<>(); + + @AfterEach + void shutdownNodes() { + servers.values().forEach(IgniteServer::shutdown); + servers.clear(); + } + + @Test + void physicalTopology(TestInfo testInfo) { + int nodesCount = 2; + + IgniteServer node1 = startEmbeddedNode(testInfo, false, 0, nodesCount); + IgniteServer node2 = startEmbeddedNode(testInfo, false, 1, nodesCount); + + assertThat(node1.name(), is(equalTo(node2.name()))); + + await().untilAsserted(() -> { + assertThat(getPhysicalTopologyMembers(node1), hasSize(nodesCount)); + assertThat(getPhysicalTopologyMembers(node2), hasSize(nodesCount)); + }); + } + + @Test + void logicalTopology(TestInfo testInfo) { + int nodesCount = 3; + + IgniteServer metaStorageAndCmgNode = startEmbeddedNode(testInfo, true, 0, nodesCount); + startEmbeddedNode(testInfo, false, 1, nodesCount); + startEmbeddedNode(testInfo, false, 2, nodesCount); + + InitParameters initParameters = InitParameters.builder() + .metaStorageNodes(metaStorageAndCmgNode) + .clusterName("cluster") + .build(); + + // Can't init cluster with duplicate node names + assertThat( + metaStorageAndCmgNode.initClusterAsync(initParameters), + willThrow(InitException.class, "Unable to initialize the cluster: Duplicate consistent id") + ); + + // When duplicate node is stopped + stopNode(2); + + await().until(() -> getPhysicalTopologyMembers(metaStorageAndCmgNode), hasSize(2)); + + // Then cluster is initialized successfully + assertThat(metaStorageAndCmgNode.initClusterAsync(initParameters), willCompleteSuccessfully()); + + // New node with duplicate name can't join the cluster. It's added to the list of duplicate ids on nodes 0 and 1 and node 1 is added Review Comment: Removed the comment. The list in question is actually a map `ScaleCubeTopologyService.membersByConsistentId` ########## modules/runner/src/integrationTest/java/org/apache/ignite/internal/cluster/management/ItDuplicateNodesTest.java: ########## @@ -0,0 +1,172 @@ +/* + * 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.internal.cluster.management; + +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.testframework.IgniteTestUtils.shortTestMethodName; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowWithCauseOrSuppressed; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +import java.lang.reflect.Method; +import java.nio.file.Path; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.IntStream; +import org.apache.ignite.IgniteServer; +import org.apache.ignite.InitParameters; +import org.apache.ignite.internal.app.IgniteServerImpl; +import org.apache.ignite.internal.lang.IgniteStringFormatter; +import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; +import org.apache.ignite.internal.testframework.TestIgnitionManager; +import org.apache.ignite.internal.testframework.WorkDirectory; +import org.apache.ignite.internal.testframework.WorkDirectoryExtension; +import org.apache.ignite.network.ClusterNode; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; +import org.junit.jupiter.api.extension.ExtendWith; + +@ExtendWith(WorkDirectoryExtension.class) +class ItDuplicateNodesTest 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; + + private final Map<Integer, IgniteServer> servers = new HashMap<>(); + + @AfterEach + void shutdownNodes() { + servers.values().forEach(IgniteServer::shutdown); + servers.clear(); + } + + @Test + void physicalTopology(TestInfo testInfo) { + int nodesCount = 2; + + IgniteServer node1 = startEmbeddedNode(testInfo, false, 0, nodesCount); + IgniteServer node2 = startEmbeddedNode(testInfo, false, 1, nodesCount); + + assertThat(node1.name(), is(equalTo(node2.name()))); + + await().untilAsserted(() -> { + assertThat(getPhysicalTopologyMembers(node1), hasSize(nodesCount)); + assertThat(getPhysicalTopologyMembers(node2), hasSize(nodesCount)); + }); + } + + @Test + void logicalTopology(TestInfo testInfo) { + int nodesCount = 3; + + IgniteServer metaStorageAndCmgNode = startEmbeddedNode(testInfo, true, 0, nodesCount); + startEmbeddedNode(testInfo, false, 1, nodesCount); + startEmbeddedNode(testInfo, false, 2, nodesCount); Review Comment: Done ########## modules/network/src/main/java/org/apache/ignite/internal/network/scalecube/ScaleCubeTopologyService.java: ########## @@ -187,8 +190,9 @@ public ClusterNode getByAddress(NetworkAddress addr) { /** {@inheritDoc} */ @Override - public ClusterNode getByConsistentId(String consistentId) { - return consistentIdToMemberMap.get(consistentId); + public @Nullable ClusterNode getByConsistentId(String consistentId) { + Map<UUID, ClusterNode> nodes = consistentIdToMemberMap.get(consistentId); + return nodes != null ? nodes.values().iterator().next() : null; Review Comment: Is it even possible to listen for the logical topology from the network code? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
