From fdd5a0e03e6843a5443ff515ec0f395c441badd2 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Thu, 2 Apr 2026 16:48:03 +0500 Subject: [PATCH 1/2] WIP --- .../IgniteDiscoveryMassiveNodeFailTest.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) rename modules/core/src/test/java/org/apache/ignite/{internal => spi/discovery/tcp}/IgniteDiscoveryMassiveNodeFailTest.java (95%) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteDiscoveryMassiveNodeFailTest.java similarity index 95% rename from modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java rename to modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteDiscoveryMassiveNodeFailTest.java index f69d068efe147..13889407a1865 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteDiscoveryMassiveNodeFailTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteDiscoveryMassiveNodeFailTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal; +package org.apache.ignite.spi.discovery.tcp; import java.io.IOException; import java.net.InetSocketAddress; @@ -31,9 +31,9 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.EventType; +import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.GridConcurrentHashSet; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIoSession; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.testframework.junits.WithSystemProperty; @@ -146,8 +146,16 @@ private void doFailNodes(boolean simulateNodeFailure) throws Exception { forceFailConnectivity = true; if (simulateNodeFailure) { - for (int i = 3; i < 5; i++) - ((TcpDiscoverySpi)grid(i).configuration().getDiscoverySpi()).simulateNodeFailure(); + for (int i = 3; i < 5; i++) { + TcpDiscoverySpi spi = (TcpDiscoverySpi)grid(i).configuration().getDiscoverySpi(); + + spi.simulateNodeFailure(); + + Iterable readers = U.field((ServerImpl)U.field(spi, "impl"), "readers"); + + U.interrupt(readers); + U.joinThreads(readers, log); + } } assert latch.await(waitTime(), TimeUnit.MILLISECONDS); From 55c1fc0f35f362c9f1923400e929d1d9e9875a67 Mon Sep 17 00:00:00 2001 From: Dmitry Werner Date: Thu, 2 Apr 2026 16:58:07 +0500 Subject: [PATCH 2/2] WIP --- .../ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java index af3cd558edddc..578eaa0879367 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java @@ -17,7 +17,6 @@ package org.apache.ignite.testsuites; -import org.apache.ignite.internal.IgniteDiscoveryMassiveNodeFailTest; import org.apache.ignite.internal.managers.discovery.IgniteDiscoveryMessageSerializationTest; import org.apache.ignite.spi.ExponentialBackoffTimeoutStrategyTest; import org.apache.ignite.spi.GridTcpSpiForwardingSelfTest; @@ -35,6 +34,7 @@ import org.apache.ignite.spi.discovery.tcp.IgniteClientConnectTest; import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownSslTest; import org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest; +import org.apache.ignite.spi.discovery.tcp.IgniteDiscoveryMassiveNodeFailTest; import org.apache.ignite.spi.discovery.tcp.IgniteMetricsOverflowTest; import org.apache.ignite.spi.discovery.tcp.MultiDataCenterRingTest; import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryMarshallerCheckSelfTest;