http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/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 dcd4ce1..880e37e 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 @@ -23,12 +23,12 @@ 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.configuration.DataRegionConfiguration; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.pagemem.PageIdAllocator; import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl; -import org.apache.ignite.internal.processors.cache.persistence.MemoryMetricsImpl; +import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl; import org.apache.ignite.internal.processors.cache.persistence.MetadataStorage; import org.apache.ignite.internal.mem.file.MappedFileMemoryProvider; import org.apache.ignite.internal.pagemem.PageMemory; @@ -156,7 +156,7 @@ public class MetadataStorageSelfTest extends GridCommonAbstractTest { protected PageMemory memory(boolean clean) throws Exception { DirectMemoryProvider provider = new MappedFileMemoryProvider(log(), allocationPath); - MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration() + DataRegionConfiguration plcCfg = new DataRegionConfiguration() .setMaxSize(30 * 1024 * 1024).setInitialSize(30 * 1024 * 1024); return new PageMemoryNoStoreImpl( @@ -165,7 +165,7 @@ public class MetadataStorageSelfTest extends GridCommonAbstractTest { null, PAGE_SIZE, plcCfg, - new MemoryMetricsImpl(plcCfg), + new DataRegionMetricsImpl(plcCfg), true); } }
http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java index 53e5daf..f22128c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java @@ -22,23 +22,23 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; -import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicy; +import org.apache.ignite.internal.processors.cache.persistence.DataRegion; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** - * Test verifies correct construction of swap file path {@link MemoryPolicyConfiguration#setSwapFilePath(String)} + * Test verifies correct construction of swap file path {@link DataRegionConfiguration#setSwapPath(String)} * when absolute or relative paths are provided via configuration. */ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest { /** */ - private MemoryConfiguration memCfg; + private DataStorageConfiguration memCfg; /** */ private static final String RELATIVE_SWAP_PATH = "relSwapPath"; @@ -50,7 +50,7 @@ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - cfg.setMemoryConfiguration(memCfg); + cfg.setDataStorageConfiguration(memCfg); return cfg; } @@ -118,7 +118,7 @@ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest { private String extractDefaultPageMemoryAllocPath(GridKernalContext context) { IgniteCacheDatabaseSharedManager dbMgr = context.cache().context().database(); - Map<String, MemoryPolicy> memPlcMap = U.field(dbMgr, "memPlcMap"); + Map<String, DataRegion> memPlcMap = U.field(dbMgr, "dataRegionMap"); PageMemory pageMem = memPlcMap.get("default").pageMemory(); @@ -128,22 +128,22 @@ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest { } /** - * @param isRelativePath flag is set to {@code true} if relative path should be used for memory policy configuration. + * @param isRelativePath flag is set to {@code true} if relative path should be used for data region configuration. */ - private MemoryConfiguration createMemoryConfiguration(boolean isRelativePath) { - MemoryConfiguration memCfg = new MemoryConfiguration(); + private DataStorageConfiguration createMemoryConfiguration(boolean isRelativePath) { + DataStorageConfiguration memCfg = new DataStorageConfiguration(); - MemoryPolicyConfiguration memPlcCfg = new MemoryPolicyConfiguration(); + DataRegionConfiguration memPlcCfg = new DataRegionConfiguration(); memPlcCfg.setName("default"); memPlcCfg.setMaxSize(20 * 1024 * 1024); if (isRelativePath) - memPlcCfg.setSwapFilePath(RELATIVE_SWAP_PATH); + memPlcCfg.setSwapPath(RELATIVE_SWAP_PATH); else - memPlcCfg.setSwapFilePath(Paths.get(getTmpDir(), ABSOLUTE_SWAP_PATH).toString()); + memPlcCfg.setSwapPath(Paths.get(getTmpDir(), ABSOLUTE_SWAP_PATH).toString()); - memCfg.setMemoryPolicies(memPlcCfg); + memCfg.setDefaultDataRegionConfiguration(memPlcCfg); return memCfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java index 1e5fcd1..a0ce285 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsIgniteMock.java @@ -17,6 +17,9 @@ package org.apache.ignite.internal.processors.igfs; +import org.apache.ignite.DataRegionMetrics; +import org.apache.ignite.DataRegionMetricsAdapter; +import org.apache.ignite.DataStorageMetricsAdapter; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.IgniteAtomicSequence; @@ -38,6 +41,7 @@ import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteServices; import org.apache.ignite.IgniteSet; import org.apache.ignite.IgniteTransactions; +import org.apache.ignite.DataStorageMetrics; import org.apache.ignite.MemoryMetrics; import org.apache.ignite.PersistenceMetrics; import org.apache.ignite.cache.affinity.Affinity; @@ -584,26 +588,41 @@ public class IgfsIgniteMock implements IgniteEx { } /** {@inheritDoc} */ - @Override public Collection<MemoryMetrics> memoryMetrics() { + @Override public Collection<DataRegionMetrics> dataRegionMetrics() { throwUnsupported(); return null; } /** {@inheritDoc} */ - @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + @Nullable @Override public DataRegionMetrics dataRegionMetrics(String memPlcName) { throwUnsupported(); return null; } /** {@inheritDoc} */ - @Override public PersistenceMetrics persistentStoreMetrics() { + @Override public DataStorageMetrics dataStorageMetrics() { throwUnsupported(); return null; } + /** {@inheritDoc} */ + @Override public Collection<MemoryMetrics> memoryMetrics() { + return DataRegionMetricsAdapter.collectionOf(dataRegionMetrics()); + } + + /** {@inheritDoc} */ + @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName)); + } + + /** {@inheritDoc} */ + @Override public PersistenceMetrics persistentStoreMetrics() { + return DataStorageMetricsAdapter.valueOf(dataStorageMetrics()); + } + /** * Throw {@link UnsupportedOperationException}. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index 597efe1..0acb1d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -24,10 +24,10 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.FileSystemConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper; import org.apache.ignite.igfs.IgfsInputStream; @@ -396,14 +396,14 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { @Override public void apply(IgniteConfiguration cfg) { String memPlcName = "igfsDataMemPlc"; - cfg.setMemoryConfiguration(new MemoryConfiguration().setMemoryPolicies( - new MemoryPolicyConfiguration().setMaxSize(maxSize).setInitialSize(maxSize).setName(memPlcName))); + cfg.setDataStorageConfiguration(new DataStorageConfiguration().setDataRegionConfigurations( + new DataRegionConfiguration().setMaxSize(maxSize).setInitialSize(maxSize).setName(memPlcName))); FileSystemConfiguration igfsCfg = cfg.getFileSystemConfiguration()[0]; - igfsCfg.getDataCacheConfiguration().setMemoryPolicyName(memPlcName); + igfsCfg.getDataCacheConfiguration().setDataRegionName(memPlcName); - cfg.setCacheConfiguration(new CacheConfiguration().setName("QQQ").setMemoryPolicyName(memPlcName)); + cfg.setCacheConfiguration(new CacheConfiguration().setName("QQQ").setDataRegionName(memPlcName)); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java index 779f095..c08e144 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java @@ -21,6 +21,10 @@ import java.util.Collection; import java.util.UUID; import java.util.concurrent.ExecutorService; import javax.management.MBeanServer; +import org.apache.ignite.DataRegionMetrics; +import org.apache.ignite.DataRegionMetricsAdapter; +import org.apache.ignite.DataStorageMetrics; +import org.apache.ignite.DataStorageMetricsAdapter; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; @@ -469,20 +473,35 @@ public class IgniteMock implements Ignite { } /** {@inheritDoc} */ - @Override public Collection<MemoryMetrics> memoryMetrics() { + @Override public Collection<DataRegionMetrics> dataRegionMetrics() { return null; } /** {@inheritDoc} */ - @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + @Nullable @Override public DataRegionMetrics dataRegionMetrics(String memPlcName) { return null; } /** {@inheritDoc} */ - @Override public PersistenceMetrics persistentStoreMetrics() { + @Override public DataStorageMetrics dataStorageMetrics() { return null; } + /** {@inheritDoc} */ + @Override public Collection<MemoryMetrics> memoryMetrics() { + return DataRegionMetricsAdapter.collectionOf(dataRegionMetrics()); + } + + /** {@inheritDoc} */ + @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName)); + } + + /** {@inheritDoc} */ + @Override public PersistenceMetrics persistentStoreMetrics() { + return DataStorageMetricsAdapter.valueOf(dataStorageMetrics()); + } + /** * @param staticCfg Configuration. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java index 2f91e40..86a374a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java @@ -26,6 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import javax.cache.CacheException; +import org.apache.ignite.DataRegionMetrics; +import org.apache.ignite.DataRegionMetricsAdapter; +import org.apache.ignite.DataStorageMetricsAdapter; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; @@ -49,6 +52,7 @@ import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteServices; import org.apache.ignite.IgniteSet; import org.apache.ignite.IgniteTransactions; +import org.apache.ignite.DataStorageMetrics; import org.apache.ignite.MemoryMetrics; import org.apache.ignite.PersistenceMetrics; import org.apache.ignite.cache.affinity.Affinity; @@ -742,21 +746,36 @@ public class IgniteProcessProxy implements IgniteEx { } /** {@inheritDoc} */ - @Override public Collection<MemoryMetrics> memoryMetrics() { + @Override public Collection<DataRegionMetrics> dataRegionMetrics() { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ - @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + @Nullable @Override public DataRegionMetrics dataRegionMetrics(String memPlcName) { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ - @Override public PersistenceMetrics persistentStoreMetrics() { + @Override public DataStorageMetrics dataStorageMetrics() { throw new UnsupportedOperationException("Operation isn't supported yet."); } /** {@inheritDoc} */ + @Override public Collection<MemoryMetrics> memoryMetrics() { + return DataRegionMetricsAdapter.collectionOf(dataRegionMetrics()); + } + + /** {@inheritDoc} */ + @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName)); + } + + /** {@inheritDoc} */ + @Override public PersistenceMetrics persistentStoreMetrics() { + return DataStorageMetricsAdapter.valueOf(dataStorageMetrics()); + } + + /** {@inheritDoc} */ @Override public void close() throws IgniteException { if (locJvmGrid != null) { final CountDownLatch rmtNodeStoppedLatch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java index 5c4d7fd..7ca9467 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java @@ -54,7 +54,7 @@ import org.apache.ignite.internal.processors.database.BPlusTreeFakeReuseSelfTest import org.apache.ignite.internal.processors.database.BPlusTreeReuseSelfTest; import org.apache.ignite.internal.processors.database.BPlusTreeSelfTest; import org.apache.ignite.internal.processors.database.FreeListImplSelfTest; -import org.apache.ignite.internal.processors.database.MemoryMetricsSelfTest; +import org.apache.ignite.internal.processors.database.DataRegionMetricsSelfTest; import org.apache.ignite.internal.processors.database.MetadataStorageSelfTest; import org.apache.ignite.internal.processors.database.SwapPathConstructionSelfTest; import org.apache.ignite.internal.processors.odbc.OdbcConfigurationValidationSelfTest; @@ -175,7 +175,7 @@ public class IgniteBasicTestSuite extends TestSuite { suite.addTestSuite(BPlusTreeReuseSelfTest.class); suite.addTestSuite(MetadataStorageSelfTest.class); suite.addTestSuite(FreeListImplSelfTest.class); - suite.addTestSuite(MemoryMetricsSelfTest.class); + suite.addTestSuite(DataRegionMetricsSelfTest.class); suite.addTestSuite(SwapPathConstructionSelfTest.class); suite.addTestSuite(IgniteMarshallerCacheFSRestoreTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index e8810bb..047550d 100755 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -78,7 +78,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheStoreValueBytesSelfT import org.apache.ignite.internal.processors.cache.GridCacheSwapPreloadSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTtlManagerSelfTest; import org.apache.ignite.internal.processors.cache.GridCacheTxPartitionedLocalStoreSelfTest; -import org.apache.ignite.internal.processors.cache.GridMemoryConfigurationConsistencySelfTest; +import org.apache.ignite.internal.processors.cache.GridDataStorageConfigurationConsistencySelfTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicLocalWithStoreInvokeTest; @@ -225,7 +225,7 @@ public class IgniteCacheTestSuite extends TestSuite { // suite.addTestSuite(GridCacheP2PUndeploySelfTest.class); suite.addTestSuite(GridCacheConfigurationValidationSelfTest.class); suite.addTestSuite(GridCacheConfigurationConsistencySelfTest.class); - suite.addTestSuite(GridMemoryConfigurationConsistencySelfTest.class); + suite.addTestSuite(GridDataStorageConfigurationConsistencySelfTest.class); suite.addTestSuite(GridCacheJdbcBlobStoreSelfTest.class); suite.addTestSuite(GridCacheJdbcBlobStoreMultithreadedSelfTest.class); suite.addTestSuite(JdbcTypesDefaultTransformerTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 31ad015..6f5b710 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.processors.cache.CacheEnumOperationsSingleNode import org.apache.ignite.internal.processors.cache.CacheEnumOperationsTest; import org.apache.ignite.internal.processors.cache.CacheExchangeMessageDuplicatedStateTest; import org.apache.ignite.internal.processors.cache.CacheGroupLocalConfigurationSelfTest; -import org.apache.ignite.internal.processors.cache.CacheMemoryPolicyConfigurationTest; +import org.apache.ignite.internal.processors.cache.CacheDataRegionConfigurationTest; import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterSingleServerTest; import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterTest; import org.apache.ignite.internal.processors.cache.CrossCacheTxNearEnabledRandomOperationsTest; @@ -262,7 +262,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(CacheConfigurationLeakTest.class)); suite.addTest(new TestSuite(MemoryPolicyConfigValidationTest.class)); suite.addTest(new TestSuite(MemoryPolicyInitializationTest.class)); - suite.addTest(new TestSuite(CacheMemoryPolicyConfigurationTest.class)); + suite.addTest(new TestSuite(CacheDataRegionConfigurationTest.class)); suite.addTest(new TestSuite(CacheGroupLocalConfigurationSelfTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsSingleNodeTest.class)); suite.addTest(new TestSuite(CacheEnumOperationsTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java index d92d848..b1e80ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java @@ -18,12 +18,12 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.persistence.IgniteDataStorageMetricsSelfTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsContinuousRestartTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsContinuousRestartTestWithSharedGroupAndIndexes; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsExchangeDuringCheckpointTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsPageSizesTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsRecoveryAfterFileCorruptionTest; -import org.apache.ignite.internal.processors.cache.persistence.IgnitePersistenceMetricsSelfTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreDataStructuresTest; import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsPageEvictionDuringPartitionClearTest; import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsRebalancingOnNotStableTopologyTest; @@ -53,7 +53,7 @@ public class IgnitePdsTestSuite2 extends TestSuite { suite.addTestSuite(IgnitePdsPageSizesTest.class); // Metrics test. - suite.addTestSuite(IgnitePersistenceMetricsSelfTest.class); + suite.addTestSuite(IgniteDataStorageMetricsSelfTest.class); suite.addTestSuite(IgnitePdsTransactionsHangTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java index 5c3e1bd..3194a4c 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java @@ -110,7 +110,7 @@ public class H2TreeIndex extends GridH2IndexBase { name, cctx.offheap().reuseListForIndex(name), cctx.groupId(), - cctx.memoryPolicy().pageMemory(), + cctx.dataRegion().pageMemory(), cctx.shared().wal(), cctx.offheap().globalRemoveId(), tbl.rowFactory(), http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java index 998e1e4..4a32dfd 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistentStoreConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.processors.database.IgniteDbSingleNodeWithIndexingPutGetTest; import org.apache.ignite.internal.util.typedef.internal.U; @@ -33,8 +33,8 @@ public class IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest extends Ignite @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setPersistentStoreConfiguration( - new PersistentStoreConfiguration() + cfg.setDataStorageConfiguration( + new DataStorageConfiguration() .setWalMode(WALMode.LOG_ONLY) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java index 0a0afb4..079dcdf 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java @@ -43,8 +43,9 @@ import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.GridRandom; import org.apache.ignite.internal.util.typedef.F; @@ -136,9 +137,10 @@ public abstract class IgniteCacheDistributedPartitionQueryAbstractSelfTest exten @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - MemoryConfiguration memCfg = new MemoryConfiguration().setDefaultMemoryPolicySize(20 * 1024 * 1024); + DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration( + new DataRegionConfiguration().setMaxSize(20 * 1024 * 1024)); - cfg.setMemoryConfiguration(memCfg); + cfg.setDataStorageConfiguration(memCfg); TcpDiscoverySpi spi = (TcpDiscoverySpi)cfg.getDiscoverySpi(); spi.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java index 943a5c8..627b3eb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java @@ -33,8 +33,9 @@ import org.apache.ignite.cache.query.QueryCancelledException; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -90,9 +91,10 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); - MemoryConfiguration memCfg = new MemoryConfiguration().setDefaultMemoryPolicySize(50 * 1024 * 1024); + DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration( + new DataRegionConfiguration().setMaxSize(50 * 1024 * 1024)); - c.setMemoryConfiguration(memCfg); + c.setDataStorageConfiguration(memCfg); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java index b25359a..2beea8b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java @@ -31,9 +31,9 @@ import org.apache.ignite.Ignition; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor; @@ -259,16 +259,10 @@ public abstract class DynamicColumnsAbstractTest extends GridCommonAbstractTest cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); - MemoryConfiguration memCfg = new MemoryConfiguration() - .setDefaultMemoryPolicyName("default") - .setMemoryPolicies( - new MemoryPolicyConfiguration() - .setName("default") - .setMaxSize(128 * 1024 * 1024L) - .setInitialSize(128 * 1024 * 1024L) - ); + DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration( + new DataRegionConfiguration().setMaxSize(128 * 1024 * 1024)); - cfg.setMemoryConfiguration(memCfg); + cfg.setDataStorageConfiguration(memCfg); return optimize(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java index 70197f5..a39283b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java @@ -28,9 +28,9 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.typedef.T2; @@ -141,16 +141,10 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes cfg.setMarshaller(new BinaryMarshaller()); - MemoryConfiguration memCfg = new MemoryConfiguration() - .setDefaultMemoryPolicyName("default") - .setMemoryPolicies( - new MemoryPolicyConfiguration() - .setName("default") - .setMaxSize(128 * 1024 * 1024L) - .setInitialSize(128 * 1024 * 1024L) - ); + DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration( + new DataRegionConfiguration().setMaxSize(128 * 1024 * 1024)); - cfg.setMemoryConfiguration(memCfg); + cfg.setDataStorageConfiguration(memCfg); return optimize(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java index 544eb74..ab0d520 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/LongIndexNameTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistentStoreConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -44,7 +44,7 @@ public class LongIndexNameTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { return super.getConfiguration(igniteInstanceName) - .setPersistentStoreConfiguration(new PersistentStoreConfiguration()) + .setDataStorageConfiguration(new DataStorageConfiguration()) .setCacheConfiguration(new <String, Person>CacheConfiguration("cache") .setQueryEntities(getIndexCfg()) .setAffinity(new RendezvousAffinityFunction(false, 16))); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java index 8f6afd8..54667df 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java @@ -27,8 +27,10 @@ import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistentStoreConfiguration; +import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.util.typedef.F; @@ -111,7 +113,12 @@ public class IgniteDbSingleNodeWithIndexingWalRestoreTest extends GridCommonAbst cfg.setCacheConfiguration(indexedCacheCfg); - cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); + DataStorageConfiguration memCfg = new DataStorageConfiguration() + .setDefaultDataRegionConfiguration( + new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true)) + .setWalMode(WALMode.LOG_ONLY); + + cfg.setDataStorageConfiguration(memCfg); cfg.setConsistentId(gridName); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.java index 5bb1eb1..c37dbda 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistentStoreConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -56,11 +56,11 @@ public class IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest extends G cfg.setCacheConfiguration(cacheCfg(CACHE_NAME)); - PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); + DataStorageConfiguration pCfg = new DataStorageConfiguration(); - pCfg.setCheckpointingFrequency(1000); + pCfg.setCheckpointFrequency(1000); - cfg.setPersistentStoreConfiguration(pCfg); + cfg.setDataStorageConfiguration(pCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java index a408596..1474954 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java @@ -27,8 +27,9 @@ import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.cache.persistence.DbCheckpointListener; @@ -71,13 +72,15 @@ public class IgnitePersistentStoreSchemaLoadTest extends GridCommonAbstractTest cfg.setCacheConfiguration(cacheCfg(TMPL_NAME)); - PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); + DataStorageConfiguration pCfg = new DataStorageConfiguration(); - pCfg.setCheckpointingFrequency(1000); + pCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(100 * 1024 * 1024)); - cfg.setPersistentStoreConfiguration(pCfg); + pCfg.setCheckpointFrequency(1000); - cfg.setActiveOnStart(true); + cfg.setDataStorageConfiguration(pCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java index 8deb61f..8283003 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java @@ -41,8 +41,8 @@ import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.cache.store.CacheStoreAdapter; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; @@ -141,7 +141,7 @@ public class IgniteSqlNotNullConstraintTest extends GridCommonAbstractTest { c.setClientMode(true); // Not allowed to have local cache on client without memory config - c.setMemoryConfiguration(new MemoryConfiguration()); + c.setDataStorageConfiguration(new DataStorageConfiguration()); } return c; http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java index 4a69887..41dd4f1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/InlineIndexHelperTest.java @@ -25,12 +25,12 @@ import java.util.Comparator; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import org.apache.commons.io.Charsets; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider; import org.apache.ignite.internal.pagemem.PageIdAllocator; import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl; -import org.apache.ignite.internal.processors.cache.persistence.MemoryMetricsImpl; +import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.h2.result.SortOrder; import org.h2.value.CompareMode; @@ -181,7 +181,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private int putAndCompare(String v1, String v2, int maxSize) throws Exception { - MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setInitialSize(1024 * MB) + DataRegionConfiguration plcCfg = new DataRegionConfiguration().setInitialSize(1024 * MB) .setMaxSize(1024 * MB); PageMemory pageMem = new PageMemoryNoStoreImpl(log, @@ -189,7 +189,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { null, PAGE_SIZE, plcCfg, - new MemoryMetricsImpl(plcCfg), + new DataRegionMetricsImpl(plcCfg), false); pageMem.start(); @@ -279,7 +279,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { /** */ public void testStringTruncate() throws Exception { - MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setInitialSize(1024 * MB) + DataRegionConfiguration plcCfg = new DataRegionConfiguration().setInitialSize(1024 * MB) .setMaxSize(1024 * MB); PageMemory pageMem = new PageMemoryNoStoreImpl(log(), @@ -287,7 +287,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { null, PAGE_SIZE, plcCfg, - new MemoryMetricsImpl(plcCfg), + new DataRegionMetricsImpl(plcCfg), false); pageMem.start(); @@ -330,7 +330,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { /** */ public void testBytes() throws Exception { - MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setInitialSize(1024 * MB) + DataRegionConfiguration plcCfg = new DataRegionConfiguration().setInitialSize(1024 * MB) .setMaxSize(1024 * MB); PageMemory pageMem = new PageMemoryNoStoreImpl(log(), @@ -338,7 +338,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { null, PAGE_SIZE, plcCfg, - new MemoryMetricsImpl(plcCfg), + new DataRegionMetricsImpl(plcCfg), false); pageMem.start(); @@ -449,7 +449,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { /** */ private void testPutGet(Value v1, Value v2, Value v3) throws Exception { - MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setInitialSize(1024 * MB) + DataRegionConfiguration plcCfg = new DataRegionConfiguration().setInitialSize(1024 * MB) .setMaxSize(1024 * MB); PageMemory pageMem = new PageMemoryNoStoreImpl(log(), @@ -457,7 +457,7 @@ public class InlineIndexHelperTest extends GridCommonAbstractTest { null, PAGE_SIZE, plcCfg, - new MemoryMetricsImpl(plcCfg), + new DataRegionMetricsImpl(plcCfg), false); pageMem.start(); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java index cfbe2e0..114f630 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingCoreTestSuite.java @@ -27,6 +27,7 @@ import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsPageE import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsCacheIntegrationTest; import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsNoActualWalHistoryTest; import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsThreadInterruptionTest; +import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRecoveryPPCTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRecoveryTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalRecoveryTxLogicalRecordsTest; @@ -52,6 +53,8 @@ public class IgnitePdsWithIndexingCoreTestSuite extends TestSuite { suite.addTestSuite(IgnitePdsAtomicCacheRebalancingTest.class); suite.addTestSuite(IgnitePdsTxCacheRebalancingTest.class); + suite.addTestSuite(IgniteWalRecoveryPPCTest.class); + suite.addTestSuite(IgnitePdsBinaryMetadataOnClusterRestartTest.class); suite.addTestSuite(IgnitePdsMarshallerMappingRestoreOnNodeStartTest.class); suite.addTestSuite(IgnitePdsThreadInterruptionTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs index cde216b..73636d1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs @@ -316,7 +316,6 @@ namespace Apache.Ignite.Core.Tests Assert.IsNotNull(mem); Assert.AreEqual("dfltPlc", mem.DefaultMemoryPolicyName); - Assert.AreEqual(MemoryConfiguration.DefaultPageSize, mem.PageSize); Assert.AreEqual(MemoryConfiguration.DefaultSystemCacheInitialSize, mem.SystemCacheInitialSize); Assert.AreEqual(MemoryConfiguration.DefaultSystemCacheMaxSize, mem.SystemCacheMaxSize); @@ -324,7 +323,6 @@ namespace Apache.Ignite.Core.Tests Assert.AreEqual("dfltPlc", plc.Name); Assert.AreEqual(MemoryPolicyConfiguration.DefaultEmptyPagesPoolSize, plc.EmptyPagesPoolSize); Assert.AreEqual(MemoryPolicyConfiguration.DefaultEvictionThreshold, plc.EvictionThreshold); - Assert.AreEqual(MemoryPolicyConfiguration.DefaultInitialSize, plc.InitialSize); Assert.AreEqual(MemoryPolicyConfiguration.DefaultMaxSize, plc.MaxSize); Assert.AreEqual(MemoryPolicyConfiguration.DefaultSubIntervals, plc.SubIntervals); Assert.AreEqual(MemoryPolicyConfiguration.DefaultRateTimeInterval, plc.RateTimeInterval); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java index b4f89f2..00941d0 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationConfig; +import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider; @@ -59,6 +60,8 @@ public class GridJettyObjectMapper extends ObjectMapper { module.addSerializer(GridCacheSqlMetadata.class, IGNITE_SQL_METADATA_SERIALIZER); module.addSerializer(GridCacheSqlIndexMetadata.class, IGNITE_SQL_INDEX_METADATA_SERIALIZER); + configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + registerModule(module); } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 1f80574..4cba76e 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -273,24 +273,39 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ - @Override public Collection<MemoryMetrics> memoryMetrics() { + @Override public Collection<DataRegionMetrics> dataRegionMetrics() { checkIgnite(); - return g.memoryMetrics(); + return g.dataRegionMetrics(); } /** {@inheritDoc} */ - @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + @Nullable @Override public DataRegionMetrics dataRegionMetrics(String memPlcName) { checkIgnite(); - return g.memoryMetrics(memPlcName); + return g.dataRegionMetrics(memPlcName); } /** {@inheritDoc} */ - @Override public PersistenceMetrics persistentStoreMetrics() { + @Override public DataStorageMetrics dataStorageMetrics() { checkIgnite(); - return g.persistentStoreMetrics(); + return g.dataStorageMetrics(); + } + + /** {@inheritDoc} */ + @Override public Collection<MemoryMetrics> memoryMetrics() { + return DataRegionMetricsAdapter.collectionOf(dataRegionMetrics()); + } + + /** {@inheritDoc} */ + @Nullable @Override public MemoryMetrics memoryMetrics(String memPlcName) { + return DataRegionMetricsAdapter.valueOf(dataRegionMetrics(memPlcName)); + } + + /** {@inheritDoc} */ + @Override public PersistenceMetrics persistentStoreMetrics() { + return DataStorageMetricsAdapter.valueOf(dataStorageMetrics()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorActivationCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorActivationCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorActivationCommandSpec.scala index fb2a7f4..a772492 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorActivationCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/top/VisorActivationCommandSpec.scala @@ -18,7 +18,7 @@ package org.apache.ignite.visor.commands.top import org.apache.ignite.Ignition -import org.apache.ignite.configuration.{IgniteConfiguration, MemoryConfiguration, PersistentStoreConfiguration} +import org.apache.ignite.configuration._ import org.apache.ignite.visor.commands.top.VisorTopologyCommand._ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import VisorRuntimeBaseSpec._ @@ -30,11 +30,14 @@ class VisorActivationCommandSpec extends VisorRuntimeBaseSpec(2) { override protected def config(name: String): IgniteConfiguration = { val cfg = super.config(name) - val memCfg = new MemoryConfiguration - memCfg.setDefaultMemoryPolicySize(10 * 1024 * 1024) + val dfltReg = new DataRegionConfiguration + val dataRegCfg = new DataStorageConfiguration - cfg.setMemoryConfiguration(memCfg) - cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration) + dfltReg.setMaxSize(10 * 1024 * 1024) + dfltReg.setPersistenceEnabled(true) + dataRegCfg.setDefaultDataRegionConfiguration(dfltReg) + + cfg.setDataStorageConfiguration(dataRegCfg) cfg } http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index a07f979..bfe1ae2 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -960,6 +960,61 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose name: String, size: Number }], + dataStorageConfiguration: { + systemRegionInitialSize: Number, + systemRegionMaxSize: Number, + pageSize: Number, + concurrencyLevel: Number, + defaultDataRegionConfiguration: { + name: String, + initialSize: Number, + maxSize: Number, + swapPath: String, + pageEvictionMode: {type: String, enum: ['DISABLED', 'RANDOM_LRU', 'RANDOM_2_LRU']}, + evictionThreshold: Number, + emptyPagesPoolSize: Number, + metricsEnabled: Boolean, + metricsSubIntervalCount: Number, + metricsRateTimeInterval: Number, + persistenceEnabled: Boolean + }, + dataRegionConfigurations: [{ + name: String, + initialSize: Number, + maxSize: Number, + swapPath: String, + pageEvictionMode: {type: String, enum: ['DISABLED', 'RANDOM_LRU', 'RANDOM_2_LRU']}, + evictionThreshold: Number, + emptyPagesPoolSize: Number, + metricsEnabled: Boolean, + metricsSubIntervalCount: Number, + metricsRateTimeInterval: Number, + persistenceEnabled: Boolean + }], + storagePath: String, + metricsEnabled: Boolean, + alwaysWriteFullPages: Boolean, + checkpointFrequency: Number, + checkpointPageBufferSize: Number, + checkpointThreads: Number, + checkpointWriteOrder: {type: String, enum: ['RANDOM', 'SEQUENTIAL']}, + walPath: String, + walArchivePath: String, + walMode: {type: String, enum: ['DEFAULT', 'LOG_ONLY', 'BACKGROUND', 'NONE']}, + walSegments: Number, + walSegmentSize: Number, + walHistorySize: Number, + walFlushFrequency: Number, + walFsyncDelayNanos: Number, + walRecordIteratorBufferSize: Number, + lockWaitTime: Number, + walThreadLocalBufferSize: Number, + metricsSubIntervalCount: Number, + metricsRateTimeInterval: Number, + fileIOFactory: {type: String, enum: ['RANDOM', 'ASYNC']}, + walAutoArchiveAfterInactivity: Number, + writeThrottlingEnabled: Boolean + }, memoryConfiguration: { systemCacheInitialSize: Number, systemCacheMaxSize: Number, http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/web-console/frontend/app/components/page-configure-basic/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-basic/controller.js b/modules/web-console/frontend/app/components/page-configure-basic/controller.js index c0b56ac..cafdb20 100644 --- a/modules/web-console/frontend/app/components/page-configure-basic/controller.js +++ b/modules/web-console/frontend/app/components/page-configure-basic/controller.js @@ -57,7 +57,7 @@ export default class PageConfigureBasicController { allClusterCaches: this.getAllClusterCaches(state.configureBasic), cachesMenu: this.getCachesMenu(state.list.caches), clustersMenu: this.getClustersMenu(state.list.clusters), - defaultMemoryPolicy: this.getDefaultClusterMemoryPolicy(state.configureBasic.cluster), + defaultMemoryPolicy: this.getDefaultClusterMemoryPolicy(state.configureBasic.cluster, version), memorySizeInputVisible: this.getMemorySizeInputVisibility(version) })) .do((value) => this.applyValue(value)); @@ -125,8 +125,12 @@ export default class PageConfigureBasicController { return [...state.oldClusterCaches, ...state.newClusterCaches]; } - getDefaultClusterMemoryPolicy(cluster) { - return get(cluster, 'memoryConfiguration.memoryPolicies', []).find((p) => p.name === 'default'); + getDefaultClusterMemoryPolicy(cluster, version) { + if (this.Version.since(version.ignite, ['2.1.0', '2.3.0'])) + return get(cluster, 'memoryConfiguration.memoryPolicies', []).find((p) => p.name === 'default'); + + return get(cluster, 'dataStorageConfiguration.defaultDataRegionConfiguration') || + get(cluster, 'dataStorageConfiguration.dataRegionConfigurations', []).find((p) => p.name === 'default'); } getMemorySizeInputVisibility(version) { http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js index a67f7b9..f6f471c 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js @@ -138,6 +138,11 @@ export default class AbstractTransformer { return this.toSection(this.generator.clusterMemory(memoryConfiguration, available)); } + // Generate memory configuration group. + static clusterDataStorageConfiguration(dataStorageCfg, available) { + return this.toSection(this.generator.clusterDataStorageConfiguration(dataStorageCfg, available)); + } + // Generate marshaller group. static clusterMisc(cluster, available) { return this.toSection(this.generator.clusterMisc(cluster, available)); http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index 9d7887a..74588f0 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -81,6 +81,11 @@ export default class IgniteConfigurationGenerator { this.clusterCollision(cluster.collision, cfg); this.clusterCommunication(cluster, cfg); this.clusterConnector(cluster.connector, cfg); + + // Since ignite 2.3 + if (available('2.3.0')) + this.clusterDataStorageConfiguration(cluster.dataStorageConfiguration, available, cfg); + this.clusterDeployment(cluster, available, cfg); this.clusterEvents(cluster, available, cfg); this.clusterFailover(cluster, available, cfg); @@ -89,19 +94,23 @@ export default class IgniteConfigurationGenerator { this.clusterLogger(cluster.logger, cfg); this.clusterMarshaller(cluster, available, cfg); - // Since ignite 2.0 - if (available('2.0.0')) + // Since ignite 2.0 and deprecated in ignite 2.3 + if (available(['2.0.0', '2.3.0'])) this.clusterMemory(cluster.memoryConfiguration, available, cfg); this.clusterMisc(cluster, available, cfg); this.clusterMetrics(cluster, available, cfg); this.clusterODBC(cluster.odbc, available, cfg); - this.clusterPersistence(cluster.persistenceStoreConfiguration, available, cfg); + + // Since ignite 2.1 deprecated in ignite 2.3 + if (available(['2.1.0', '2.3.0'])) + this.clusterPersistence(cluster.persistenceStoreConfiguration, available, cfg); + this.clusterQuery(cluster, available, cfg); this.clusterServiceConfiguration(cluster.serviceConfigurations, cluster.caches, cfg); this.clusterSsl(cluster, cfg); - // Removed in ignite 2.0 + // Deprecated in ignite 2.0 if (available(['1.0.0', '2.0.0'])) this.clusterSwap(cluster, cfg); @@ -1333,6 +1342,95 @@ export default class IgniteConfigurationGenerator { return cfg; } + static dataRegionConfiguration(dataRegionCfg) { + const plcBean = new Bean('org.apache.ignite.configuration.DataRegionConfiguration', 'dataRegionCfg', dataRegionCfg, clusterDflts.dataStorageConfiguration.dataRegionConfigurations); + + return plcBean.stringProperty('name') + .longProperty('initialSize') + .longProperty('maxSize') + .stringProperty('swapPath') + .enumProperty('pageEvictionMode') + .doubleProperty('evictionThreshold') + .intProperty('emptyPagesPoolSize') + .intProperty('metricsSubIntervalCount') + .longProperty('metricsRateTimeInterval') + .boolProperty('metricsEnabled') + .boolProperty('persistenceEnabled'); + } + + // Generate data storage configuration. + static clusterDataStorageConfiguration(dataStorageCfg, available, cfg = this.igniteConfigurationBean()) { + if (!available('2.3.0')) + return cfg; + + const storageBean = new Bean('org.apache.ignite.configuration.DataStorageConfiguration', 'dataStorageCfg', dataStorageCfg, clusterDflts.dataStorageConfiguration); + + storageBean.intProperty('pageSize') + .intProperty('concurrencyLevel') + .intProperty('systemRegionInitialSize') + .intProperty('systemRegionMaxSize'); + + const dfltDataRegionCfg = this.dataRegionConfiguration(_.get(dataStorageCfg, 'defaultDataRegionConfiguration')); + + if (!dfltDataRegionCfg.isEmpty()) + storageBean.beanProperty('defaultDataRegionConfiguration', dfltDataRegionCfg); + + const dataRegionCfgs = []; + + _.forEach(_.get(dataStorageCfg, 'dataRegionConfigurations'), (dataRegionCfg) => { + const plcBean = this.dataRegionConfiguration(dataRegionCfg); + + if (plcBean.isEmpty()) + return; + + dataRegionCfgs.push(plcBean); + }); + + if (!_.isEmpty(dataRegionCfgs)) + storageBean.varArgProperty('dataRegionConfigurations', 'dataRegionConfigurations', dataRegionCfgs, 'org.apache.ignite.configuration.DataRegionConfiguration'); + + storageBean.stringProperty('storagePath') + .intProperty('checkpointFrequency') + .longProperty('checkpointPageBufferSize') + .intProperty('checkpointThreads') + .enumProperty('walMode') + .stringProperty('walPath') + .stringProperty('walArchivePath') + .intProperty('walSegments') + .intProperty('walSegmentSize') + .intProperty('walHistorySize') + .longProperty('walFlushFrequency') + .longProperty('walFsyncDelayNanos') + .intProperty('walRecordIteratorBufferSize') + .longProperty('lockWaitTime') + .intProperty('walThreadLocalBufferSize') + .intProperty('metricsSubIntervalCount') + .intProperty('metricsRateTimeInterval') + .longProperty('walAutoArchiveAfterInactivity') + .boolProperty('metricsEnabled') + .boolProperty('alwaysWriteFullPages') + .boolProperty('writeThrottlingEnabled'); + + const fileIOFactory = _.get(dataStorageCfg, 'fileIOFactory'); + + let factoryBean; + + if (fileIOFactory === 'RANDOM') + factoryBean = new Bean('org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory', 'rndFileIoFactory', {}); + else if (fileIOFactory === 'ASYNC') + factoryBean = new Bean('org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory', 'asyncFileIoFactory', {}); + + if (factoryBean) + storageBean.beanProperty('fileIOFactory', factoryBean); + + if (storageBean.isEmpty()) + return cfg; + + cfg.beanProperty('dataStorageConfiguration', storageBean); + + return cfg; + } + // Generate miscellaneous configuration. static clusterMisc(cluster, available, cfg = this.igniteConfigurationBean(cluster)) { cfg.stringProperty('workDirectory'); @@ -1473,7 +1571,7 @@ export default class IgniteConfigurationGenerator { // Generate cluster query group. static clusterPersistence(persistence, available, cfg = this.igniteConfigurationBean()) { - if (!available('2.1.0') || _.get(persistence, 'enabled') !== true) + if (!available(['2.1.0', '2.3.0']) || _.get(persistence, 'enabled') !== true) return cfg; const bean = new Bean('org.apache.ignite.configuration.PersistentStoreConfiguration', 'PersistenceCfg', http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js index 1c7fc44..0e786d9 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js @@ -311,6 +311,46 @@ const DFLT_CLUSTER = { rateTimeInterval: 60000 } }, + dataStorageConfiguration: { + systemCacheInitialSize: 41943040, + systemCacheMaxSize: 104857600, + pageSize: 2048, + storagePath: 'db', + dataRegionConfigurations: { + name: 'default', + initialSize: 268435456, + pageEvictionMode: { + clsName: 'org.apache.ignite.configuration.DataPageEvictionMode', + value: 'DISABLED' + }, + evictionThreshold: 0.9, + emptyPagesPoolSize: 100, + metricsEnabled: false, + metricsSubIntervalCount: 5, + metricsRateTimeInterval: 60000 + }, + metricsEnabled: false, + alwaysWriteFullPages: false, + checkpointFrequency: 180000, + checkpointPageBufferSize: 268435456, + checkpointThreads: 4, + walMode: { + clsName: 'org.apache.ignite.configuration.WALMode', + value: 'DEFAULT' + }, + walPath: 'db/wal', + walArchivePath: 'db/wal/archive', + walSegments: 10, + walSegmentSize: 67108864, + walHistorySize: 20, + walFlushFrequency: 2000, + walFsyncDelayNanos: 1000, + walRecordIteratorBufferSize: 67108864, + lockWaitTime: 10000, + walThreadLocalBufferSize: 131072, + metricsSubIntervalCount: 5, + metricsRateTimeInterval: 60000 + }, utilityCacheKeepAliveTime: 60000, hadoopConfiguration: { mapReducePlanner: {