Repository: ignite Updated Branches: refs/heads/ignite-5075-pds 4f19e3e7b -> a814dc4f1
Corrected default checkpoint pool size Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a245d620 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a245d620 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a245d620 Branch: refs/heads/ignite-5075-pds Commit: a245d620a6c4ca5c560171dcb6f69fa879a17481 Parents: b84df56 Author: Dmitriy Govorukhin <[email protected]> Authored: Thu May 25 10:43:19 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu May 25 10:43:19 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../configuration/MemoryConfiguration.java | 12 ++- .../pagemem/impl/PageMemoryNoStoreImpl.java | 14 +++- .../IgniteCacheDatabaseSharedManager.java | 86 ++++++++++++-------- .../database/MetadataStorageSelfTest.java | 13 ++- .../GridCacheDatabaseSharedManager.java | 38 +++++++-- ...istentStoreCacheRebalancingAbstractTest.java | 2 + .../db/file/PageStoreEvictionSelfTest.java | 20 +++-- 8 files changed, 126 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java index 2832fbd..d6015d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java @@ -615,6 +615,9 @@ public final class IgniteSystemProperties { */ public static final String IGNITE_PDS_WAL_REBALANCE_THRESHOLD = "IGNITE_PDS_WAL_REBALANCE_THRESHOLD"; + /** Ignite page memory concurrency level. */ + public static final String IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL = "IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL"; + /** Returns true for system properties only avoiding sending sensitive information. */ private static final IgnitePredicate<Map.Entry<String, String>> PROPS_FILTER = new IgnitePredicate<Map.Entry<String, String>>() { @Override public boolean apply(final Map.Entry<String, String> entry) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java index e6324dc..2d71e99 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java @@ -102,7 +102,7 @@ public class MemoryConfiguration implements Serializable { private String dfltMemPlcName = DFLT_MEM_PLC_DEFAULT_NAME; /** Size of memory (in bytes) to use for default MemoryPolicy. */ - private Long dfltMemPlcSize; + private long dfltMemPlcSize = DFLT_MEMORY_POLICY_MAX_SIZE; /** Memory policies. */ private MemoryPolicyConfiguration[] memPlcs; @@ -126,6 +126,8 @@ public class MemoryConfiguration implements Serializable { * @return {@code this} for chaining. */ public MemoryConfiguration setSystemCacheInitialSize(long sysCacheInitSize) { + A.ensure(sysCacheMaxSize > 0, "System cache initial size can not be less zero."); + this.sysCacheInitSize = sysCacheInitSize; return this; @@ -149,6 +151,8 @@ public class MemoryConfiguration implements Serializable { * @return {@code this} for chaining. */ public MemoryConfiguration setSystemCacheMaxSize(long sysCacheMaxSize) { + A.ensure(sysCacheMaxSize > 0, "System cache max size can not be less zero."); + this.sysCacheMaxSize = sysCacheMaxSize; return this; @@ -214,7 +218,7 @@ public class MemoryConfiguration implements Serializable { public MemoryPolicyConfiguration createDefaultPolicyConfig() { MemoryPolicyConfiguration memPlc = new MemoryPolicyConfiguration(); - long maxSize = (dfltMemPlcSize != null) ? dfltMemPlcSize : DFLT_MEMORY_POLICY_MAX_SIZE; + long maxSize = dfltMemPlcSize; if (maxSize < DFLT_MEMORY_POLICY_INITIAL_SIZE) memPlc.setInitialSize(maxSize); @@ -248,10 +252,10 @@ public class MemoryConfiguration implements Serializable { /** * Gets a size for default memory policy overridden by user. * - * @return default memory policy size overridden by user or -1 if nothing was specified. + * @return default memory policy size overridden by user or {@link #DFLT_MEMORY_POLICY_MAX_SIZE} if nothing was specified. */ public long getDefaultMemoryPolicySize() { - return (dfltMemPlcSize != null) ? dfltMemPlcSize : -1; + return dfltMemPlcSize; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java index 7bc92d6..b205991 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.mem.DirectMemoryRegion; @@ -40,6 +41,7 @@ import org.apache.ignite.internal.util.OffheapReadWriteLock; import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException; import org.apache.ignite.internal.util.typedef.internal.U; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL; import static org.apache.ignite.internal.util.GridUnsafe.wrapPointer; /** @@ -143,6 +145,12 @@ public class PageMemoryNoStoreImpl implements PageMemory { /** */ private OffheapReadWriteLock rwLock; + /** Concurrency lvl. */ + private final int lockConcLvl = IgniteSystemProperties.getInteger( + IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL, + Runtime.getRuntime().availableProcessors() * 4 + ); + /** */ private final int totalPages; @@ -182,8 +190,7 @@ public class PageMemoryNoStoreImpl implements PageMemory { totalPages = (int)(memPlcCfg.getMaxSize() / sysPageSize); - // TODO configure concurrency level. - rwLock = new OffheapReadWriteLock(128); + rwLock = new OffheapReadWriteLock(lockConcLvl); } /** {@inheritDoc} */ @@ -516,9 +523,8 @@ public class PageMemoryNoStoreImpl implements PageMemory { if (cmp < 0) high = mid - 1; - else if (cmp > 0) { + else if (cmp > 0) low = mid + 1; - } else return seg.pageIndex(seqNo); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java index 0a906b2..098fa1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java @@ -106,24 +106,21 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap * @throws IgniteCheckedException If failed. */ public void init() throws IgniteCheckedException { - if (memPlcMap == null) { - MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration(); + MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration(); - if (memCfg == null) - memCfg = new MemoryConfiguration(); + assert memCfg != null; - validateConfiguration(memCfg); + validateConfiguration(memCfg); - pageSize = memCfg.getPageSize(); + pageSize = memCfg.getPageSize(); - initPageMemoryPolicies(memCfg); + initPageMemoryPolicies(memCfg); - registerMetricsMBeans(); + registerMetricsMBeans(); - startMemoryPolicies(); + startMemoryPolicies(); - initPageMemoryDataStructures(memCfg); - } + initPageMemoryDataStructures(memCfg); } /** @@ -220,9 +217,11 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap memPlcMap = U.newHashMap(2); memMetricsMap = U.newHashMap(2); - addMemoryPolicy(memCfg, + addMemoryPolicy( + memCfg, memCfg.createDefaultPolicyConfig(), - DFLT_MEM_PLC_DEFAULT_NAME); + DFLT_MEM_PLC_DEFAULT_NAME + ); U.warn(log, "No user-defined default MemoryPolicy found; system default of 1GB size will be used."); } @@ -234,9 +233,11 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap memPlcMap = U.newHashMap(memPlcsCfgs.length + 2); memMetricsMap = U.newHashMap(memPlcsCfgs.length + 2); - addMemoryPolicy(memCfg, + addMemoryPolicy( + memCfg, memCfg.createDefaultPolicyConfig(), - DFLT_MEM_PLC_DEFAULT_NAME); + DFLT_MEM_PLC_DEFAULT_NAME + ); U.warn(log, "No user-defined default MemoryPolicy found; system default of 1GB size will be used."); } @@ -250,27 +251,34 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap addMemoryPolicy(memCfg, memPlcCfg, memPlcCfg.getName()); } - addMemoryPolicy(memCfg, - createSystemMemoryPolicy(memCfg.getSystemCacheInitialSize(), memCfg.getSystemCacheMaxSize()), - SYSTEM_MEMORY_POLICY_NAME); + addMemoryPolicy( + memCfg, + createSystemMemoryPolicy( + memCfg.getSystemCacheInitialSize(), + memCfg.getSystemCacheMaxSize() + ), + SYSTEM_MEMORY_POLICY_NAME + ); } /** - * @param dbCfg Database config. + * @param memCfg Database config. * @param memPlcCfg Memory policy config. * @param memPlcName Memory policy name. */ - private void addMemoryPolicy(MemoryConfiguration dbCfg, - MemoryPolicyConfiguration memPlcCfg, - String memPlcName) { - String dfltMemPlcName = dbCfg.getDefaultMemoryPolicyName(); + private void addMemoryPolicy( + MemoryConfiguration memCfg, + MemoryPolicyConfiguration memPlcCfg, + String memPlcName + ) { + String dfltMemPlcName = memCfg.getDefaultMemoryPolicyName(); if (dfltMemPlcName == null) dfltMemPlcName = DFLT_MEM_PLC_DEFAULT_NAME; MemoryMetricsImpl memMetrics = new MemoryMetricsImpl(memPlcCfg); - MemoryPolicy memPlc = initMemory(dbCfg, memPlcCfg, memMetrics); + MemoryPolicy memPlc = initMemory(memCfg, memPlcCfg, memMetrics); memPlcMap.put(memPlcName, memPlc); @@ -328,8 +336,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap Set<String> plcNames = (plcCfgs != null) ? U.<String>newHashSet(plcCfgs.length) : new HashSet<String>(0); - checkSystemMemoryPolicySizeConfiguration(memCfg.getSystemCacheInitialSize(), - memCfg.getSystemCacheMaxSize()); + checkSystemMemoryPolicySizeConfiguration( + memCfg.getSystemCacheInitialSize(), + memCfg.getSystemCacheMaxSize() + ); if (plcCfgs != null) { for (MemoryPolicyConfiguration plcCfg : plcCfgs) { @@ -344,9 +354,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap } checkDefaultPolicyConfiguration( - memCfg.getDefaultMemoryPolicyName(), - memCfg.getDefaultMemoryPolicySize(), - plcNames); + memCfg.getDefaultMemoryPolicyName(), + memCfg.getDefaultMemoryPolicySize(), + plcNames + ); } /** @@ -355,7 +366,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap * * @throws IgniteCheckedException In case of validation violation. */ - private void checkSystemMemoryPolicySizeConfiguration(long sysCacheInitSize, long sysCacheMaxSize) throws IgniteCheckedException { + private static void checkSystemMemoryPolicySizeConfiguration( + long sysCacheInitSize, + long sysCacheMaxSize + ) throws IgniteCheckedException { if (sysCacheInitSize < MIN_PAGE_MEMORY_SIZE) throw new IgniteCheckedException("Initial size for system cache must have size more than 10MB (use " + "MemoryConfiguration.systemCacheInitialSize property to set correct size in bytes) " + @@ -388,7 +402,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap long dfltPlcSize, Collection<String> plcNames ) throws IgniteCheckedException { - if (dfltPlcSize != -1) { + if (dfltPlcSize != MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE) { if (!F.eq(dfltPlcName, MemoryConfiguration.DFLT_MEM_PLC_DEFAULT_NAME)) throw new IgniteCheckedException("User-defined MemoryPolicy configuration " + "and defaultMemoryPolicySize properties are set at the same time. " + @@ -843,7 +857,15 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap MemoryPolicyConfiguration memPlcCfg, MemoryMetricsImpl memMetrics ) { - return new PageMemoryNoStoreImpl(log, memProvider, cctx, memCfg.getPageSize(), memPlcCfg, memMetrics, false); + return new PageMemoryNoStoreImpl( + log, + memProvider, + cctx, + memCfg.getPageSize(), + memPlcCfg, + memMetrics, + false + ); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java index b98f429..5206472 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java @@ -17,6 +17,12 @@ package org.apache.ignite.internal.processors.database; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.pagemem.FullPageId; @@ -30,13 +36,6 @@ import org.apache.ignite.internal.processors.cache.database.RootPage; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.atomic.AtomicLong; - /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java index c1fed9f..589ae13 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java @@ -150,7 +150,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan IgniteSystemProperties.getLong(IGNITE_PDS_PARTITION_DESTROY_CHECKPOINT_DELAY, 30_000); /** */ - private final int ggWalRebalanceThreshold = IgniteSystemProperties.getInteger( + private final int walRebalanceThreshold = IgniteSystemProperties.getInteger( IGNITE_PDS_WAL_REBALANCE_THRESHOLD, 500_000); /** Checkpoint lock hold count. */ @@ -355,15 +355,36 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan ); // Intentionally use identity comparison to check if configuration default has changed. - //noinspection NumberEquality + // Noinspection NumberEquality. if (cpBufSize == PersistenceConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) { MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration(); + assert memCfg != null; + + long totalSize = memCfg.getSystemCacheMaxSize(); + + if (memCfg.getMemoryPolicies() == null) + totalSize += MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE; + else { + for (MemoryPolicyConfiguration memPlc : memCfg.getMemoryPolicies()) { + if (Long.MAX_VALUE - memPlc.getMaxSize() > totalSize) + totalSize += memPlc.getMaxSize(); + else { + totalSize = Long.MAX_VALUE; + + break; + } + } + + assert totalSize > 0; + } + // Limit the checkpoint page buffer size by 2GB. - //TODO find max page cache and use it instead of memCfg.getPageCacheSize() (replaced with Long.MAX_VALUE now) - long adjusted = Math.min(Long.MAX_VALUE / 4, 2 * 1024L * 1024L * 1024L); + long dfltSize = 2 * 1024L * 1024L * 1024L; + + long adjusted = Math.min(totalSize / 4, dfltSize); - if (memCfg != null && cpBufSize < adjusted) { + if (cpBufSize < adjusted) { U.quietAndInfo(log, "Default checkpoint page buffer size is too small, setting to an adjusted value: " + U.readableSize(adjusted, false) @@ -555,7 +576,10 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan ) { return new PageMemoryImpl( memProvider, - calculateFragmentSizes(memCfg.getConcurrencyLevel(), plcCfg.getMaxSize()), + calculateFragmentSizes( + memCfg.getConcurrencyLevel(), + plcCfg.getMaxSize() + ), cctx, memCfg.getPageSize(), new GridInClosure3X<FullPageId, ByteBuffer, Integer>() { @@ -880,7 +904,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan continue; for (GridDhtLocalPartition part : cacheCtx.topology().currentLocalPartitions()) { - if (part.state() != GridDhtPartitionState.OWNING || part.dataStore().size() <= ggWalRebalanceThreshold) + if (part.state() != GridDhtPartitionState.OWNING || part.dataStore().size() <= walRebalanceThreshold) continue; CheckpointEntry cpEntry = searchCheckpointEntry(cacheCtx, part.id(), null); http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java index ecb12f5..6aa98af 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java @@ -362,6 +362,8 @@ public abstract class IgnitePersistentStoreCacheRebalancingAbstractTest extends * @throws Exception If failed. */ public void testTopologyChangesWithConstantLoad() throws Exception { + fail("only for one run, must be removed soon"); + final int entriesCnt = 10_000; int maxNodesCount = 4; int topChanges = 20; http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java index cc43613..0d9f598 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java @@ -59,6 +59,9 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest { /** */ private static final int PAGES_NUM = 128_000; + /** Cache name. */ + private final String cacheName = "cache"; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { final IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -67,6 +70,8 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest { cfg.setMemoryConfiguration(createDbConfig()); + cfg.setCacheConfiguration(new CacheConfiguration<>(cacheName)); + return cfg; } @@ -74,19 +79,19 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest { * @return DB config. */ private MemoryConfiguration createDbConfig() { - final MemoryConfiguration dbCfg = new MemoryConfiguration(); + final MemoryConfiguration memCfg = new MemoryConfiguration(); MemoryPolicyConfiguration memPlcCfg = new MemoryPolicyConfiguration(); memPlcCfg.setInitialSize(MEMORY_LIMIT); memPlcCfg.setMaxSize(MEMORY_LIMIT); memPlcCfg.setName("dfltMemPlc"); - dbCfg.setPageSize(PAGE_SIZE); - dbCfg.setConcurrencyLevel(NUMBER_OF_SEGMENTS); - dbCfg.setMemoryPolicies(memPlcCfg); - dbCfg.setDefaultMemoryPolicyName("dfltMemPlc"); + memCfg.setPageSize(PAGE_SIZE); + memCfg.setConcurrencyLevel(NUMBER_OF_SEGMENTS); + memCfg.setMemoryPolicies(memPlcCfg); + memCfg.setDefaultMemoryPolicyName("dfltMemPlc"); - return dbCfg; + return memCfg; } @@ -111,11 +116,10 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest { */ public void testPageEviction() throws Exception { final IgniteEx ig = startGrid(0); - ig.getOrCreateCache(new CacheConfiguration<>("partitioned")); final PageMemory memory = getMemory(ig); - writeData(ig, memory, CU.cacheId("partitioned")); + writeData(ig, memory, CU.cacheId(cacheName)); } /**
