This is an automated email from the ASF dual-hosted git repository.
sergey-chugunov-1985 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 70ebfefb3e4 IGNITE-29266 Flaky
testConnectionRecoveryWithEntireDCFailure() (#13782)
70ebfefb3e4 is described below
commit 70ebfefb3e4a8fabb8b1d8798c3a77e832666667
Author: Vladimir Steshin <[email protected]>
AuthorDate: Wed Nov 11 14:45:49 2026 +0300
IGNITE-29266 Flaky testConnectionRecoveryWithEntireDCFailure() (#13782)
---
.../discovery/tcp/MultiDataCenterSplitTest.java | 75 +++++++++-------------
1 file changed, 29 insertions(+), 46 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/MultiDataCenterSplitTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/MultiDataCenterSplitTest.java
index b429c35ba17..b610a6bf77d 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/MultiDataCenterSplitTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/MultiDataCenterSplitTest.java
@@ -23,12 +23,12 @@ import java.net.Socket;
import java.net.SocketTimeoutException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Set;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteSystemProperties;
@@ -65,6 +65,9 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
/** */
private static final String DC_ID_2 = "DC2";
+ /** */
+ private final Map<Integer, String> portToDc = new ConcurrentHashMap<>();
+
/** */
private Supplier<TcpDiscoverySpi> discoSpiSupplier;
@@ -144,10 +147,6 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
startDCs(dcCnt);
- // Ensure the ports order.
- for (int g = 0; g < srvrsPerDc * dcCnt; ++g)
- assertEquals(discoSpi(grid(g)).locNode.discoveryPort(), DFLT_PORT
+ g);
-
// Register the log listeners.
// There is 2 close-ring-to-local-DC scenarios: 1 - remote DC is
completely pinged and doesn't answer enough
// in some time before the connection recovery timeout and before
corner node gets segmented; 2 - corner node
@@ -215,64 +214,46 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
if (cnt == 2) {
// Start DC0. It misses connection to DC1.
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID,
DC_ID_0);
- discoSpiSupplier = () -> testDiscovery(DFLT_PORT + srvrsPerDc,
DFLT_PORT + srvrsPerDc * 2 - 1);
+ discoSpiSupplier = () -> new
TestTcpDiscoverySpi(Collections.singleton(DC_ID_1), fullTimeoutFailure,
pingPoolSize);
- startGrids(srvrsPerDc);
+ startGridsMultiThreaded(srvrsPerDc);
// Start DC1. It misses connection to DC0.
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID,
DC_ID_1);
- discoSpiSupplier = () -> testDiscovery(DFLT_PORT, DFLT_PORT +
srvrsPerDc - 1);
+ discoSpiSupplier = () -> new
TestTcpDiscoverySpi(Collections.singleton(DC_ID_0), fullTimeoutFailure,
pingPoolSize);
+
+ startGridsMultiThreaded(srvrsPerDc, srvrsPerDc);
- for (int g = srvrsPerDc; g < srvrsPerDc << 1; ++g)
- startGrid(g);
+ for (Ignite ig : G.allGrids())
+ portToDc.put(discoSpi(ig).getLocalPort(),
ig.cluster().localNode().dataCenterId());
}
else {
// Start DC0. It misses connection to DC1.
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID,
DC_ID_0);
- discoSpiSupplier = () -> testDiscovery(DFLT_PORT + srvrsPerDc,
DFLT_PORT + srvrsPerDc * 2 - 1);
+ discoSpiSupplier = () -> new
TestTcpDiscoverySpi(Collections.singleton(DC_ID_1), fullTimeoutFailure,
pingPoolSize);
- startGrids(srvrsPerDc);
+ startGridsMultiThreaded(srvrsPerDc);
// Start DC1. It misses connection to DC0 and DC2.
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID,
DC_ID_1);
- discoSpiSupplier = () -> testDiscovery(DFLT_PORT, DFLT_PORT +
srvrsPerDc * 3 - 1,
- DFLT_PORT + srvrsPerDc, DFLT_PORT + srvrsPerDc * 2 - 1);
+ discoSpiSupplier = () -> new TestTcpDiscoverySpi(F.asSet(DC_ID_0,
DC_ID_2), fullTimeoutFailure, pingPoolSize);
- for (int g = srvrsPerDc; g < srvrsPerDc * 2; ++g)
- startGrid(g);
+ startGridsMultiThreaded(srvrsPerDc, srvrsPerDc);
// Start DC2. It misses connection to DC1.
System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID,
DC_ID_2);
- discoSpiSupplier = () -> testDiscovery(DFLT_PORT + srvrsPerDc,
DFLT_PORT + srvrsPerDc * 2 - 1);
+ discoSpiSupplier = () -> new
TestTcpDiscoverySpi(Collections.singleton(DC_ID_1), fullTimeoutFailure,
pingPoolSize);
- for (int g = srvrsPerDc * 2; g < srvrsPerDc * 3; ++g)
- startGrid(g);
+ startGridsMultiThreaded(srvrsPerDc * 2, srvrsPerDc);
+
+ for (Ignite ig : G.allGrids())
+ portToDc.put(discoSpi(ig).getLocalPort(),
ig.cluster().localNode().dataCenterId());
for (int ig = srvrsPerDc; ig < srvrsPerDc * 2; ++ig)
discoSpi(grid(ig)).block = true;
}
}
- /** Creates the test Discovery SPI. */
- private TcpDiscoverySpi testDiscovery(int portFrom, int portTo) {
- assert portTo >= portFrom;
-
- return new TestTcpDiscoverySpi(IntStream.range(portFrom, portTo +
1).boxed().collect(Collectors.toSet()),
- fullTimeoutFailure, pingPoolSize);
- }
-
- /** Creates the test Discovery SPI. */
- private TcpDiscoverySpi testDiscovery(int allPortsFrom, int allPortsTo,
int workPortFrom, int workPortTo) {
- assert allPortsTo >= allPortsFrom;
- assert workPortFrom >= allPortsFrom;
- assert workPortTo <= allPortsTo;
-
- Set<Integer> failedPorts = IntStream.range(allPortsFrom, allPortsTo +
1).filter(p -> p < workPortFrom || p > workPortTo)
- .boxed().collect(Collectors.toSet());
-
- return new TestTcpDiscoverySpi(failedPorts, fullTimeoutFailure,
pingPoolSize);
- }
-
/** Check whether datacenter {@code dcId} is separated. If {@code
otherAliveDc} is not {@code null}, these DCs are expected joined. */
private void checkDcSplited(String dcId, @Nullable String otherAliveDc,
long timeout) throws IgniteInterruptedCheckedException {
assert !dcId.equals(otherAliveDc);
@@ -313,9 +294,9 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
}
/** */
- private static class TestTcpDiscoverySpi extends TcpDiscoverySpi {
+ private class TestTcpDiscoverySpi extends TcpDiscoverySpi {
/** */
- private final Collection<Integer> failedPorts;
+ private final Collection<String> dcToFail;
/** */
private final int pingPoolSize;
@@ -328,11 +309,11 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
/** */
private TestTcpDiscoverySpi(
- Collection<Integer> failedPorts,
+ Collection<String> dcToFail,
boolean fullTimeoutFailure,
int pingPoolSize
) {
- this.failedPorts = failedPorts;
+ this.dcToFail = dcToFail;
this.fullTimeoutFailure = fullTimeoutFailure;
this.pingPoolSize = pingPoolSize;
}
@@ -368,7 +349,9 @@ public class MultiDataCenterSplitTest extends
GridCommonAbstractTest {
int rmpPort =
((InetSocketAddress)sock.getRemoteSocketAddress()).getPort();
- if (!failedPorts.contains(rmpPort))
+ String rmtDc = portToDc.get(rmpPort);
+
+ if (rmtDc == null || !dcToFail.contains(rmtDc))
return;
if (data != null && Arrays.equals(U.IGNITE_HEADER, data))