This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch remove_deployment_spi in repository https://gitbox.apache.org/repos/asf/ignite.git
commit b2e2d1f08f35aac801e1f047b656db2a7020b99a Author: Nikolay Izhikov <[email protected]> AuthorDate: Tue Mar 10 13:23:51 2026 +0300 WIP --- .../GridCacheConfigurationConsistencySelfTest.java | 42 ---------------------- .../dht/GridCacheDhtPreloadSelfTest.java | 2 -- .../dht/GridCacheDhtPreloadStartStopSelfTest.java | 2 -- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 -- 4 files changed, 48 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index 4e6964e4893..190d5ea04fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -35,7 +35,6 @@ import org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicy; import org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicyFactory; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.util.typedef.C1; @@ -56,8 +55,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.NONE; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE; -import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; -import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * @@ -73,9 +70,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** */ private CacheMode cacheMode = REPLICATED; - /** */ - private DeploymentMode depMode = SHARED; - /** */ private C1<CacheConfiguration, Void> initCache; @@ -105,8 +99,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cfg.setGridLogger(strLog); } - cfg.setDeploymentMode(depMode); - if (cacheEnabled) { CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -185,7 +177,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "myCache"; cacheMode = null; - depMode = SHARED; assert startGrid(1).cache("myCache").getConfiguration(CacheConfiguration.class).getCacheMode() == DFLT_CACHE_MODE; } @@ -197,7 +188,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac public void testWithCacheAndWithoutCache() throws Exception { // 1st grid without cache. cacheEnabled = false; - depMode = SHARED; startGrid(2); @@ -205,7 +195,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "myCache"; cacheMode = REPLICATED; - depMode = SHARED; startGrid(1); } @@ -219,7 +208,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "myCache"; cacheMode = REPLICATED; - depMode = SHARED; startGrid(1); @@ -227,7 +215,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "myCache"; cacheMode = PARTITIONED; - depMode = SHARED; try { startGrid(2); @@ -248,7 +235,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "replicated"; cacheMode = REPLICATED; - depMode = SHARED; startGrid(2); @@ -256,7 +242,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "partitioned"; cacheMode = PARTITIONED; - depMode = SHARED; startGrid(3); @@ -264,37 +249,10 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac cacheEnabled = true; cacheName = "partitioned"; cacheMode = null; - depMode = SHARED; startGrid(4); } - /** - * @throws Exception If failed. - */ - @Test - public void testDifferentDeploymentModes() throws Exception { - // 1st grid with SHARED mode. - cacheEnabled = true; - cacheName = "partitioned"; - cacheMode = PARTITIONED; - depMode = SHARED; - - startGrid(1); - - // 2nd grid with CONTINUOUS mode. - cacheEnabled = true; - cacheName = "partitioned"; - cacheMode = PARTITIONED; - depMode = CONTINUOUS; - - GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override public Object call() throws Exception { - return startGrid(2); - } - }, IgniteCheckedException.class, null); - } - /** * @throws Exception If failed. */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 649dbd24a99..82d697ee4d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -50,7 +50,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; -import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_REBALANCE_BATCH_SIZE; import static org.apache.ignite.events.EventType.EVTS_CACHE_REBALANCE; import static org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.MOVING; @@ -101,7 +100,6 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); cfg.setCacheConfiguration(cacheConfiguration(igniteInstanceName)); - cfg.setDeploymentMode(CONTINUOUS); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index 47362d65149..d1c042aa257 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -41,7 +41,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; -import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_REBALANCE_BATCH_SIZE; import static org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.OWNING; @@ -109,7 +108,6 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest } cfg.setCacheConfiguration(cacheCfgs); - cfg.setDeploymentMode(CONTINUOUS); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java index a2728aa9a38..f887fc2c67d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java @@ -35,7 +35,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; -import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_REBALANCE_BATCH_SIZE; /** @@ -95,7 +94,6 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest { c.setLifecycleBeans(lbean); c.setCacheConfiguration(cc); - c.setDeploymentMode(CONTINUOUS); c.setNetworkTimeout(netTimeout); return c;
