IGNITE-6721 - Fixed page evictions in mixed mode
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3155e16 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3155e16 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3155e16 Branch: refs/heads/ignite-5937 Commit: f3155e1627fc2f89087e475ddc02dda914feb7f7 Parents: 2bc75a3 Author: Alexey Goncharuk <[email protected]> Authored: Tue Oct 24 14:02:18 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Oct 24 14:02:41 2017 +0300 ---------------------------------------------------------------------- .../cache/persistence/CacheDataRowAdapter.java | 3 +- .../IgniteCacheDatabaseSharedManager.java | 18 ++---- .../PageEvictionMultinodeMixedRegionsTest.java | 59 ++++++++++++++++++++ .../IgniteCacheEvictionSelfTestSuite.java | 3 + 4 files changed, 70 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f3155e16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java index 0fd8323..9257424 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/CacheDataRowAdapter.java @@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.pagemem.PageUtils; +import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.CacheObjectContext; @@ -132,7 +133,7 @@ public class CacheDataRowAdapter implements CacheDataRow { final long pageId = pageId(nextLink); // Group is null if try evict page, with persistence evictions should be disabled. - assert grp != null || !sharedCtx.database().persistenceEnabled(); + assert grp != null || pageMem instanceof PageMemoryNoStoreImpl; int grpId = grp != null ? grp.groupId() : 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/f3155e16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java index da598d1..933c195 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java @@ -57,7 +57,6 @@ import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseL import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; @@ -574,10 +573,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap if (!F.isEmpty(memMetricsMap)) { DataRegionMetrics memMetrics = memMetricsMap.get(memPlcName); - if (memMetrics == null) - return null; - else - return new DataRegionMetricsSnapshot(memMetrics); + return memMetrics == null ? null : new DataRegionMetricsSnapshot(memMetrics); } else return null; @@ -794,7 +790,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap DataRegionConfiguration plcCfg = memPlc.config(); - if (plcCfg.getPageEvictionMode() == DataPageEvictionMode.DISABLED) + if (plcCfg.getPageEvictionMode() == DataPageEvictionMode.DISABLED || plcCfg.isPersistenceEnabled()) return; long memorySize = plcCfg.getMaxSize(); @@ -851,7 +847,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap * @param pageMem Page memory. */ private PageEvictionTracker createPageEvictionTracker(DataRegionConfiguration plc, PageMemory pageMem) { - if (plc.getPageEvictionMode() == DataPageEvictionMode.DISABLED || CU.isPersistenceEnabled(cctx.gridConfig())) + if (plc.getPageEvictionMode() == DataPageEvictionMode.DISABLED || plc.isPersistenceEnabled()) return new NoOpPageEvictionTracker(); assert pageMem instanceof PageMemoryNoStoreImpl : pageMem.getClass(); @@ -885,12 +881,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap return null; final PdsFolderSettings folderSettings = cctx.kernalContext().pdsFolderResolver().resolveFolders(); - final String folderName; - if(folderSettings.isCompatible()) - folderName = String.valueOf(folderSettings.consistentId()).replaceAll("[:,\\.]", "_"); - else - folderName = folderSettings.folderName(); + final String folderName = folderSettings.isCompatible() ? + String.valueOf(folderSettings.consistentId()).replaceAll("[:,\\.]", "_") : + folderSettings.folderName(); return buildPath(path, folderName); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f3155e16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java new file mode 100644 index 0000000..1015e52 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.eviction.paged; + +import org.apache.ignite.configuration.DataPageEvictionMode; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.GridTestUtils; + +/** + * + */ +public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinodeTest { + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + setEvictionMode(DataPageEvictionMode.RANDOM_2_LRU, cfg); + + DataRegionConfiguration persReg = new DataRegionConfiguration() + .setName("persisted") + .setPersistenceEnabled(true); + + cfg.getDataStorageConfiguration().setDataRegionConfigurations(persReg); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + GridTestUtils.deleteDbFiles(); + + super.beforeTestsStarted(); + + clientGrid.active(true); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + super.afterTestsStopped(); + + GridTestUtils.deleteDbFiles(); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f3155e16/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java index 7985e2e..84b1452 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.eviction.lru.LruEvictionPolic import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearEvictionPolicySelfTest; import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearOnlyNearEvictionPolicySelfTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionDataStreamerTest; +import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMultinodeMixedRegionsTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionReadThroughTest; import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionTouchOrderTest; import org.apache.ignite.internal.processors.cache.eviction.paged.Random2LruNearEnabledPageEvictionMultinodeTest; @@ -82,6 +83,8 @@ public class IgniteCacheEvictionSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(PageEvictionReadThroughTest.class)); suite.addTest(new TestSuite(PageEvictionDataStreamerTest.class)); + suite.addTest(new TestSuite(PageEvictionMultinodeMixedRegionsTest.class)); + return suite; } }
