From c1f6dc4a31170cb32dd97eab8374311461e3a1de Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 16 Dec 2024 12:15:40 +0300 Subject: [PATCH] IGNITE-23992 Remove setForceServerMode from GridCacheRebalancingOrderingTest (#11741) --- .../GridCacheRebalancingOrderingTest.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java index b470a57a3a599..6b6ab95cab8ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java @@ -57,7 +57,6 @@ import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.services.ServiceContext; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -119,12 +118,7 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - if (isFirstGrid(igniteInstanceName)) { - assert cfg.getDiscoverySpi() instanceof TcpDiscoverySpi : cfg.getDiscoverySpi(); - - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); - } - else + if (!isFirstGrid(igniteInstanceName)) cfg.setServiceConfiguration(getServiceConfiguration()); cfg.setCacheConfiguration(getCacheConfiguration()); @@ -165,11 +159,6 @@ protected CacheConfiguration getCacheConfiguration() { return cfg; } - /** {@inheritDoc} */ - @Override protected boolean isMultiJvm() { - return true; - } - /** {@inheritDoc} */ @Override protected long getTestTimeout() { return 1000 * 60 * 5; @@ -271,10 +260,10 @@ private ServerStarter startServers() throws Exception { */ @Test public void testEvents() throws Exception { - Ignite ignite = startClientGrid(0); - ServerStarter srvStarter = startServers(); + Ignite ignite = startClientGrid(0); + IgniteCache cache = ignite.cache(TEST_CACHE_NAME); // Generate a key per partition.