Repository: ignite Updated Branches: refs/heads/1.3.3-p6 [created] 56fd27251
ignite-1280 - Fixed near evictions with off heap Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90a4594b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90a4594b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90a4594b Branch: refs/heads/1.3.3-p6 Commit: 90a4594b603eb15c754b18989af94f3cd50c02cc Parents: 9603b25 Author: Valentin Kulichenko <[email protected]> Authored: Fri Aug 21 16:27:17 2015 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Fri Aug 21 16:44:06 2015 -0700 ---------------------------------------------------------------------- .../cache/GridCacheEvictionManager.java | 2 +- .../lru/LruNearEvictionPolicySelfTest.java | 29 ++++++++++- .../LruNearOnlyNearEvictionPolicySelfTest.java | 55 +++++++++++++++++++- 3 files changed, 83 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/90a4594b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index d565af1..6b0240e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -134,7 +134,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { memoryMode = cctx.config().getMemoryMode(); - plcEnabled = plc != null && memoryMode != OFFHEAP_TIERED; + plcEnabled = plc != null && (cctx.isNear() || memoryMode != OFFHEAP_TIERED); filter = cfg.getEvictionFilter(); http://git-wip-us.apache.org/repos/asf/ignite/blob/90a4594b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java index 218b817..7910e41 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearEvictionPolicySelfTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -49,14 +50,18 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { /** Cache atomicity mode specified by test. */ private CacheAtomicityMode atomicityMode; + /** Memory mode. */ + private CacheMemoryMode memMode; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); CacheConfiguration cc = new CacheConfiguration(); - cc.setAtomicityMode(atomicityMode); cc.setCacheMode(PARTITIONED); + cc.setAtomicityMode(atomicityMode); + cc.setMemoryMode(memMode); cc.setWriteSynchronizationMode(PRIMARY_SYNC); cc.setRebalanceMode(SYNC); cc.setStartSize(100); @@ -86,6 +91,17 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { */ public void testAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testAtomicOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = ATOMIC; + memMode = CacheMemoryMode.OFFHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -95,6 +111,17 @@ public class LruNearEvictionPolicySelfTest extends GridCommonAbstractTest { */ public void testTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testTransactionalOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = TRANSACTIONAL; + memMode = CacheMemoryMode.OFFHEAP_TIERED; checkNearEvictionMaxSize(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/90a4594b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java index 0d3c692..6bf343b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/LruNearOnlyNearEvictionPolicySelfTest.java @@ -27,6 +27,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -53,6 +54,9 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes /** Cache atomicity mode specified by test. */ private CacheAtomicityMode atomicityMode; + /** Memory mode. */ + private CacheMemoryMode memMode; + /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTest(); @@ -69,8 +73,9 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes else { CacheConfiguration cc = new CacheConfiguration(); - cc.setAtomicityMode(atomicityMode); cc.setCacheMode(cacheMode); + cc.setAtomicityMode(atomicityMode); + cc.setMemoryMode(memMode); cc.setWriteSynchronizationMode(PRIMARY_SYNC); cc.setRebalanceMode(SYNC); cc.setStartSize(100); @@ -92,6 +97,18 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testPartitionedAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; cacheMode = PARTITIONED; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testPartitionedAtomicOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = ATOMIC; + cacheMode = PARTITIONED; + memMode = OFFHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -102,6 +119,18 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testPartitionedTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; cacheMode = PARTITIONED; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testPartitionedTransactionalOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = TRANSACTIONAL; + cacheMode = PARTITIONED; + memMode = OFFHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -112,6 +141,18 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testReplicatedAtomicNearEvictionMaxSize() throws Exception { atomicityMode = ATOMIC; cacheMode = REPLICATED; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testReplicatedAtomicOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = ATOMIC; + cacheMode = REPLICATED; + memMode = OFFHEAP_TIERED; checkNearEvictionMaxSize(); } @@ -122,6 +163,18 @@ public class LruNearOnlyNearEvictionPolicySelfTest extends GridCommonAbstractTes public void testReplicatedTransactionalNearEvictionMaxSize() throws Exception { atomicityMode = TRANSACTIONAL; cacheMode = REPLICATED; + memMode = ONHEAP_TIERED; + + checkNearEvictionMaxSize(); + } + + /** + * @throws Exception If failed. + */ + public void testReplicatedTransactionalOffHeapNearEvictionMaxSize() throws Exception { + atomicityMode = TRANSACTIONAL; + cacheMode = REPLICATED; + memMode = OFFHEAP_TIERED; checkNearEvictionMaxSize(); }
