From 640c7d3b80a3ead0b01643b73a5864912bdc4869 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 13 Dec 2024 23:17:07 +0300 Subject: [PATCH 1/2] IGNITE-23990 Remove setForceServerMode from CacheAffinityCallSelfTest --- .../cache/CacheAffinityCallSelfTest.java | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java index e6845640380e3..76ad61802f37d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java @@ -18,14 +18,12 @@ package org.apache.ignite.internal.processors.cache; import java.util.concurrent.Callable; -import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteCompute; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; @@ -35,7 +33,6 @@ import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteRunnable; import org.apache.ignite.resources.IgniteInstanceResource; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -62,9 +59,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { cfg.setFailoverSpi(failSpi); // Do not configure cache on client. - if (igniteInstanceName.equals(getTestIgniteInstanceName(SRVS))) - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); - else { + if (!igniteInstanceName.equals(getTestIgniteInstanceName(SRVS))) { CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setName(CACHE_NAME); ccfg.setCacheMode(PARTITIONED); @@ -177,55 +172,6 @@ public void testAffinityCallMergedExchanges() throws Exception { } } - /** - * @throws Exception If failed. - */ - @Test - public void testAffinityCallNoServerNode() throws Exception { - startGridsMultiThreaded(SRVS); - - final Integer key = 1; - - final IgniteEx client = startClientGrid(SRVS); - - assertTrue(client.configuration().isClientMode()); - assertNull(client.context().cache().cache(CACHE_NAME)); - - final int THREADS = 5; - - CyclicBarrier b = new CyclicBarrier(THREADS + 1); - - final IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable() { - @Override public Object call() throws Exception { - b.await(); - - for (int i = 0; i < SRVS; ++i) - stopGrid(i, false); - - return null; - } - }); - - try { - GridTestUtils.runMultiThreaded(new Callable() { - @Override public Void call() throws Exception { - b.await(); - - while (!fut.isDone()) - client.compute().affinityCall(CACHE_NAME, key, new CheckCallable(key, null)); - - return null; - } - }, THREADS, "test-thread"); - } - catch (ClusterTopologyException e) { - log.info("Expected error: " + e); - } - finally { - stopAllGrids(); - } - } - /** * @throws Exception If failed. */ From 3025d99d525bf3d5c87c4cd6dbd144a3dbc9d431 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 14 Dec 2024 12:58:16 +0300 Subject: [PATCH 2/2] IGNITE-23990 Remove setForceServerMode from CacheLateAffinityAssignmentTest --- .../CacheLateAffinityAssignmentTest.java | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index 8c0205592d4d7..df3f86c5f5ea7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -114,9 +114,6 @@ * */ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { - /** */ - private boolean forceSrvMode; - /** */ private static final String CACHE_NAME1 = "testCache1"; @@ -158,7 +155,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { TcpDiscoverySpi discoSpi = (TcpDiscoverySpi)cfg.getDiscoverySpi(); - discoSpi.setForceServerMode(forceSrvMode); discoSpi.setNetworkTimeout(60_000); cfg.setClientFailureDetectionTimeout(100000); @@ -1949,62 +1945,11 @@ public void testInitCacheReceivedOnJoin() throws Exception { checkAffinity(4, topVer(4, 0), true); } - /** - * @throws Exception If failed. - */ - @Test - public void testClientStartFirst1() throws Exception { - clientStartFirst(1); - } - - /** - * @throws Exception If failed. - */ - @Test - public void testClientStartFirst2() throws Exception { - clientStartFirst(3); - } - - /** - * @param clients Number of client nodes. - * @throws Exception If failed. - */ - private void clientStartFirst(int clients) throws Exception { - forceSrvMode = true; - - int topVer = 0; - - for (int i = 0; i < clients; i++) - startClient(topVer, ++topVer); - - cacheC = new IgniteClosure() { - @Override public CacheConfiguration[] apply(String nodeName) { - return null; - } - }; - - startServer(topVer, ++topVer); - - checkAffinity(topVer, topVer(topVer, 0), true); - - startServer(topVer, ++topVer); - - checkAffinity(topVer, topVer(topVer, 0), false); - - checkAffinity(topVer, topVer(topVer, 1), true); - - stopNode(clients, ++topVer); - - checkAffinity(clients + 1, topVer(topVer, 0), true); - } - /** * @throws Exception If failed. */ @Test public void testRandomOperations() throws Exception { - forceSrvMode = true; - final int MAX_SRVS = 10; final int MAX_CLIENTS = 10; final int MAX_CACHES = 15;