Repository: ignite Updated Branches: refs/heads/ignite-971 fb38e1f48 -> 52dea6d36
ignite-971 Fix offheap to swap eviction. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52dea6d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52dea6d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52dea6d3 Branch: refs/heads/ignite-971 Commit: 52dea6d3603b9522e5b2e9b3dfed2eec7e871702 Parents: fb38e1f Author: sboikov <[email protected]> Authored: Fri Sep 11 15:42:54 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 11 15:42:54 2015 +0300 ---------------------------------------------------------------------- .../GridCacheAbstractRemoveFailureTest.java | 92 +++++++++++++++----- .../GridCacheDhtAtomicRemoveFailureTest.java | 16 ++-- .../dht/GridCacheDhtRemoveFailureTest.java | 16 ++-- ...tomicPrimaryWriteOrderRemoveFailureTest.java | 15 ++-- .../GridCacheAtomicRemoveFailureTest.java | 15 ++-- .../GridCacheAtomicNearRemoveFailureTest.java | 15 ++-- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 15 ++-- .../near/GridCacheNearRemoveFailureTest.java | 15 ++-- .../ignite/testframework/GridTestUtils.java | 3 +- 9 files changed, 123 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 31488e0..3b4af81 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -32,22 +32,36 @@ import javax.cache.CacheException; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE; +import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests that removes are not lost when topology changes. */ -public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstractSelfTest { +public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstractTest { + /** IP finder. */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + /** */ private static final int GRID_CNT = 3; @@ -85,17 +99,14 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER).setForceServerMode(true); if (testClientNode() && getTestGridName(0).equals(gridName)) cfg.setClientMode(true); - return cfg; - } + cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); - /** {@inheritDoc} */ - @Override protected int gridCount() { - return GRID_CNT; + return cfg; } /** {@inheritDoc} */ @@ -104,6 +115,8 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra sizePropVal = System.getProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE); System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "100000"); + + startGrids(GRID_CNT); } /** {@inheritDoc} */ @@ -111,15 +124,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra super.afterTestsStopped(); System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : ""); - } - - /** {@inheritDoc} */ - @Override protected void beforeTest() throws Exception { - startGrids(gridCount()); - } - /** {@inheritDoc} */ - @Override protected void afterTest() throws Exception { stopAllGrids(); } @@ -129,6 +134,28 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra } /** + * @return Cache mode. + */ + protected abstract CacheMode cacheMode(); + + /** + * @return Cache atomicity mode. + */ + protected abstract CacheAtomicityMode atomicityMode(); + + /** + * @return Near cache configuration. + */ + protected abstract NearCacheConfiguration nearCache(); + + /** + * @return Atomic cache write order mode. + */ + protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return null; + } + + /** * @return {@code True} if test updates from client node. */ protected boolean testClientNode() { @@ -139,9 +166,35 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra * @throws Exception If failed. */ public void testPutAndRemove() throws Exception { - assertEquals(testClientNode(), (boolean)grid(0).configuration().isClientMode()); + putAndRemove(DUR, GridTestUtils.TestMemoryMode.HEAP); + } + + /** + * @param duration Test duration. + * @param memMode Memory mode. + * @throws Exception If failed. + */ + private void putAndRemove(long duration, GridTestUtils.TestMemoryMode memMode) throws Exception { + assertEquals(testClientNode(), (boolean) grid(0).configuration().isClientMode()); + + grid(0).destroyCache(null); + + CacheConfiguration ccfg = new CacheConfiguration(); + + ccfg.setWriteSynchronizationMode(FULL_SYNC); + + ccfg.setCacheMode(cacheMode()); - final IgniteCache<Integer, Integer> sndCache0 = grid(0).cache(null); + if (cacheMode() == PARTITIONED) + ccfg.setBackups(1); + + ccfg.setAtomicityMode(atomicityMode()); + ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); + ccfg.setNearConfiguration(nearCache()); + + GridTestUtils.setMemoryMode(null, ccfg, memMode, 100, 1024); + + final IgniteCache<Integer, Integer> sndCache0 = grid(0).createCache(ccfg); final AtomicBoolean stop = new AtomicBoolean(); @@ -221,7 +274,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra }); try { - long stopTime = DUR + U.currentTimeMillis() ; + long stopTime = duration + U.currentTimeMillis() ; long nextAssert = U.currentTimeMillis() + ASSERT_FREQ; @@ -278,7 +331,6 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra updateFut.get(); log.info("Test finished. Update errors: " + errCntr.get()); - } /** @@ -289,7 +341,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCacheAbstra if (stop.get()) return; - int idx = random(1, gridCount() + 1); + int idx = random(1, GRID_CNT + 1); log.info("Killing node " + idx); http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java index b7f52ba..bee94a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtAtomicRemoveFailureTest.java @@ -17,11 +17,13 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -40,12 +42,12 @@ public class GridCacheDhtAtomicRemoveFailureTest extends GridCacheAbstractRemove } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setNearConfiguration(null); - cfg.setBackups(1); + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return CLOCK; + } - return cfg; + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearCache() { + return null; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java index 1c351ff..a13ba30 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtRemoveFailureTest.java @@ -17,10 +17,12 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; +import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -33,12 +35,12 @@ public class GridCacheDhtRemoveFailureTest extends GridCacheAbstractRemoveFailur } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setNearConfiguration(null); - cfg.setBackups(1); + @Override protected CacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } - return cfg; + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearCache() { + return null; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java index 844bde3..2fd8a82 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; @@ -42,17 +42,12 @@ public class GridCacheAtomicPrimaryWriteOrderRemoveFailureTest extends GridCache } /** {@inheritDoc} */ - @Override protected NearCacheConfiguration nearConfiguration() { - return null; + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return PRIMARY; } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setBackups(1); - cfg.setAtomicWriteOrderMode(PRIMARY); - - return cfg; + @Override protected NearCacheConfiguration nearCache() { + return null; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java index 9966e18..a21cd35 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicRemoveFailureTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; @@ -42,17 +42,12 @@ public class GridCacheAtomicRemoveFailureTest extends GridCacheAbstractRemoveFai } /** {@inheritDoc} */ - @Override protected NearCacheConfiguration nearConfiguration() { - return null; + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return CLOCK; } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setBackups(1); - cfg.setAtomicWriteOrderMode(CLOCK); - - return cfg; + @Override protected NearCacheConfiguration nearCache() { + return null; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java index a6fc2b9..d9c6e01 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicNearRemoveFailureTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; @@ -41,13 +41,12 @@ public class GridCacheAtomicNearRemoveFailureTest extends GridCacheAbstractRemov } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setNearConfiguration(new NearCacheConfiguration()); - cfg.setBackups(1); - cfg.setAtomicWriteOrderMode(CLOCK); + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return CLOCK; + } - return cfg; + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearCache() { + return new NearCacheConfiguration(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java index 6362bc8..f6e7e2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.java @@ -17,9 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.near; +import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; @@ -41,13 +41,12 @@ public class GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest extends GridC } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setNearConfiguration(new NearCacheConfiguration()); - cfg.setBackups(1); - cfg.setAtomicWriteOrderMode(PRIMARY); + @Override protected CacheAtomicWriteOrderMode atomicWriteOrderMode() { + return PRIMARY; + } - return cfg; + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearCache() { + return new NearCacheConfiguration(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java index 1cf3da1..a7e8eb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearRemoveFailureTest.java @@ -17,11 +17,12 @@ package org.apache.ignite.internal.processors.cache.distributed.near; +import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractRemoveFailureTest; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** @@ -34,12 +35,12 @@ public class GridCacheNearRemoveFailureTest extends GridCacheAbstractRemoveFailu } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); - - cfg.setNearConfiguration(new NearCacheConfiguration()); - cfg.setBackups(1); + @Override protected CacheAtomicityMode atomicityMode() { + return TRANSACTIONAL; + } - return cfg; + /** {@inheritDoc} */ + @Override protected NearCacheConfiguration nearCache() { + return new NearCacheConfiguration(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/52dea6d3/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 66aab7b..edf7c52 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1602,7 +1602,6 @@ public final class GridTestUtils { int maxHeapCnt, long maxOffheapSize) { assert testMode != null; - assert cfg != null; assert ccfg != null; CacheMemoryMode memMode; @@ -1669,7 +1668,7 @@ public final class GridTestUtils { ccfg.setMemoryMode(memMode); ccfg.setSwapEnabled(swap); - if (swap) + if (swap && cfg != null) cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); if (evictionPlc) {
