Repository: ignite Updated Branches: refs/heads/master bf0a4f859 -> c00060ba8
IGNITE-9157 Optimize memory usage of data regions in tests - Fixes #4470. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c00060ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c00060ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c00060ba Branch: refs/heads/master Commit: c00060ba83c3550c7862c75b691d70112552b5be Parents: bf0a4f8 Author: Pavel Kovalenko <[email protected]> Authored: Fri Aug 3 18:01:50 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Fri Aug 3 18:01:50 2018 +0300 ---------------------------------------------------------------------- .../JdbcThinAuthenticateConnectionSelfTest.java | 5 ++++- ...tingToWalV2SerializerWithCompactionTest.java | 5 ++++- .../PersistenceBasicCompatibilityTest.java | 1 + .../cache/CacheGroupMetricsMBeanTest.java | 2 +- .../cache/CacheMetricsManageTest.java | 6 +++++- .../WalModeChangeCommonAbstractSelfTest.java | 4 +++- .../distributed/Cache64kPartitionsTest.java | 6 ++++-- .../IgnitePdsContinuousRestartTest.java | 2 ++ ...teRebalanceScheduleResendPartitionsTest.java | 1 + ...hangeDuringRebalanceOnNonNodeAssignTest.java | 1 + ...lWalModeChangeDuringRebalancingSelfTest.java | 9 ++++---- .../PersistenceDirectoryWarningLoggingTest.java | 4 +++- ...SlowHistoricalRebalanceSmallHistoryTest.java | 5 +++++ ...gniteCheckpointDirtyPagesForLowLoadTest.java | 6 +++++- ...nitePdsCacheDestroyDuringCheckpointTest.java | 13 +++++------- ...ckpointSimulationWithRealCpDisabledTest.java | 6 +++++- .../db/wal/IgniteWalRebalanceTest.java | 7 +++++-- ...WithSmallTimeoutAndContentionOneKeyTest.java | 7 +------ .../database/IgniteDbAbstractTest.java | 6 ++++-- .../GridMarshallerMappingConsistencyTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 22 ++++++++++++++++++++ .../authentication/SqlUserCommandSelfTest.java | 8 +++++-- 22 files changed, 92 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java index 97218fb..cb4d7f3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java @@ -60,7 +60,10 @@ public class JdbcThinAuthenticateConnectionSelfTest extends JdbcThinAbstractSelf cfg.setDataStorageConfiguration(new DataStorageConfiguration() .setDefaultDataRegionConfiguration(new DataRegionConfiguration() - .setPersistenceEnabled(true))); + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) + ); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java ---------------------------------------------------------------------- diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java index c9f572f..d4c58f8 100644 --- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java +++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java @@ -59,7 +59,10 @@ public class MigratingToWalV2SerializerWithCompactionTest extends IgnitePersiste DataStorageConfiguration memCfg = new DataStorageConfiguration() .setDefaultDataRegionConfiguration( - new DataRegionConfiguration().setPersistenceEnabled(true)) + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) .setWalSegmentSize(WAL_SEGMENT_SIZE) .setWalCompactionEnabled(true) .setWalMode(WALMode.LOG_ONLY) http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java ---------------------------------------------------------------------- diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java index af14b04..f27caa3 100644 --- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java +++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java @@ -60,6 +60,7 @@ public class PersistenceBasicCompatibilityTest extends IgnitePersistenceCompatib .setDefaultDataRegionConfiguration( new DataRegionConfiguration() .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) )); cfg.setBinaryConfiguration( http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java index 19b0203..f8108eb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java @@ -153,8 +153,8 @@ public class CacheGroupMetricsMBeanTest extends GridCommonAbstractTest implement if (pds) { cfg.setDataStorageConfiguration(new DataStorageConfiguration() .setDefaultDataRegionConfiguration(new DataRegionConfiguration() - .setName("default") .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) .setMetricsEnabled(true) ).setMetricsEnabled(true) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java index 810e4c2..7c3ad66 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java @@ -495,7 +495,11 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest { if (persistence) cfg.setDataStorageConfiguration(new DataStorageConfiguration() - .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true)) + .setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) .setWalMode(WALMode.LOG_ONLY) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java index 3056a13..d4a0078 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeCommonAbstractSelfTest.java @@ -305,7 +305,9 @@ public abstract class WalModeChangeCommonAbstractSelfTest extends GridCommonAbst cfg.setDiscoverySpi(new IgniteClientReconnectAbstractTest.TestTcpDiscoverySpi().setIpFinder(IP_FINDER)); - DataRegionConfiguration regionCfg = new DataRegionConfiguration().setPersistenceEnabled(true); + DataRegionConfiguration regionCfg = new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE); DataRegionConfiguration volatileRegionCfg = new DataRegionConfiguration().setName(REGION_VOLATILE) .setPersistenceEnabled(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java index 95e90c3..e54251e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.WALMode; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -48,7 +47,10 @@ public class Cache64kPartitionsTest extends GridCommonAbstractTest { if (persistenceEnabled) { DataStorageConfiguration memCfg = new DataStorageConfiguration() .setDefaultDataRegionConfiguration( - new DataRegionConfiguration().setPersistenceEnabled(true)) + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) .setWalMode(WALMode.LOG_ONLY); cfg.setDataStorageConfiguration(memCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java index 9317707..25d54ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java @@ -80,6 +80,8 @@ public class IgnitePdsContinuousRestartTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + cfg.setConsistentId(gridName); + DataStorageConfiguration memCfg = new DataStorageConfiguration() .setDefaultDataRegionConfiguration( new DataRegionConfiguration() http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java index 274b16d..bb08a8d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java @@ -73,6 +73,7 @@ public class IgniteRebalanceScheduleResendPartitionsTest extends GridCommonAbstr .setDefaultDataRegionConfiguration( new DataRegionConfiguration() .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) ) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java index 675ed31..4f2817f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest.java @@ -69,6 +69,7 @@ public class LocalWacModeNoChangeDuringRebalanceOnNonNodeAssignTest extends Grid .setWalArchivePath(walArchivePath(name)) .setDefaultDataRegionConfiguration( new DataRegionConfiguration() + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) .setPersistenceEnabled(true) ) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java index 9ec27ce..4dd5f51 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java @@ -81,8 +81,8 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr .setDefaultDataRegionConfiguration( new DataRegionConfiguration() .setPersistenceEnabled(true) - .setMaxSize(200 * 1024 * 1024) - .setInitialSize(200 * 1024 * 1024) + .setInitialSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) ) // Test verifies checkpoint count, so it is essencial that no checkpoint is triggered by timeout .setCheckpointFrequency(999_999_999_999L) @@ -326,7 +326,7 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr * @throws Exception If failed. */ public void testWithExchangesMerge() throws Exception { - final int nodeCnt = 5; + final int nodeCnt = 4; final int keyCnt = getKeysCount(); Ignite ignite = startGrids(nodeCnt); @@ -340,14 +340,13 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr stopGrid(2); stopGrid(3); - stopGrid(4); // Rewrite data to trigger further rebalance. for (int k = 0; k < keyCnt; k++) cache.put(k, k * 2); // Start several grids in parallel to trigger exchanges merge. - startGridsMultiThreaded(2, 3); + startGridsMultiThreaded(2, 2); for (int nodeIdx = 2; nodeIdx < nodeCnt; nodeIdx++) { CacheGroupContext grpCtx = grid(nodeIdx).cachex(REPL_CACHE).context().group(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java index 7d67402..bb55c82 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/PersistenceDirectoryWarningLoggingTest.java @@ -48,7 +48,9 @@ public class PersistenceDirectoryWarningLoggingTest extends GridCommonAbstractTe DataStorageConfiguration dsCfg = new DataStorageConfiguration(); - dsCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(true); + dsCfg.getDefaultDataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE); cfg.setDataStorageConfiguration(dsCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java index 3500c8d..bd1a1a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java @@ -67,6 +67,8 @@ public class SlowHistoricalRebalanceSmallHistoryTest extends GridCommonAbstractT @Override protected IgniteConfiguration getConfiguration(String name) throws Exception { IgniteConfiguration cfg = super.getConfiguration(name); + cfg.setConsistentId(name); + cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); cfg.setDataStorageConfiguration( @@ -74,6 +76,7 @@ public class SlowHistoricalRebalanceSmallHistoryTest extends GridCommonAbstractT .setWalHistorySize(WAL_HISTORY_SIZE) .setDefaultDataRegionConfiguration( new DataRegionConfiguration() + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) .setPersistenceEnabled(true) ) .setWalSegmentSize(512 * 1024) @@ -107,6 +110,8 @@ public class SlowHistoricalRebalanceSmallHistoryTest extends GridCommonAbstractT System.clearProperty(IgniteSystemProperties.IGNITE_PDS_WAL_REBALANCE_THRESHOLD); + stopAllGrids(); + cleanPersistenceDir(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java index e5f4ac8..8baa1c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java @@ -69,7 +69,11 @@ public class IgniteCheckpointDirtyPagesForLowLoadTest extends GridCommonAbstract DataStorageConfiguration dsCfg = new DataStorageConfiguration(); dsCfg.setPageSize(1024); //smaller page to reduce overhead to short values - dsCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true)); + dsCfg.setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ); dsCfg.setCheckpointFrequency(500); dsCfg.setWalMode(WALMode.LOG_ONLY); dsCfg.setWalHistorySize(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java index 10fc386..62cc244 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.persistence.db.file; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CachePeekMode; @@ -28,11 +27,8 @@ import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR; - /** * Test for cache creation/deletion with frequent checkpoints. */ @@ -68,10 +64,11 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac DataStorageConfiguration storageCfg = new DataStorageConfiguration(); storageCfg.setCheckpointFrequency(300); - DataRegionConfiguration regionConfig = new DataRegionConfiguration(); - regionConfig.setPersistenceEnabled(true); - - storageCfg.setDefaultDataRegionConfiguration(regionConfig); + storageCfg.setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ); return storageCfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java index 0fbb255..5fa618b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java @@ -113,7 +113,11 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom .setCheckpointFrequency(500) .setWalMode(WALMode.LOG_ONLY) .setAlwaysWriteFullPages(true) - .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true)) + .setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) ); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java index 28801cd..d4f6f0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java @@ -41,7 +41,6 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.managers.communication.GridIoMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtDemandedPartitionsMap; -import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteInClosure; @@ -83,7 +82,11 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest { .setWalHistorySize(Integer.MAX_VALUE) .setWalMode(WALMode.LOG_ONLY) .setCheckpointFrequency(15 * 60 * 1000) - .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true)); + .setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ); cfg.setDataStorageConfiguration(dbCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java index 93b995e..62f4635 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteTransactions; import org.apache.ignite.cache.CacheAtomicityMode; @@ -35,12 +34,8 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2; -import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecord; import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2; -import org.apache.ignite.internal.processors.cache.verify.PartitionKey; import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -49,7 +44,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import org.apache.ignite.transactions.TransactionTimeoutException; import static org.apache.ignite.testframework.GridTestUtils.runAsync; import static org.apache.ignite.testframework.GridTestUtils.runMultiThreadedAsync; @@ -85,6 +79,7 @@ public class TxWithSmallTimeoutAndContentionOneKeyTest extends GridCommonAbstrac .setDefaultDataRegionConfiguration( new DataRegionConfiguration() .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) ) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java index 0823ee4..9a23502 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbAbstractTest.java @@ -32,7 +32,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -80,7 +79,10 @@ public abstract class IgniteDbAbstractTest extends GridCommonAbstractTest { dbCfg.setWalMode(WALMode.LOG_ONLY); dbCfg.setDefaultDataRegionConfiguration( - new DataRegionConfiguration().setPersistenceEnabled(true).setName("default")); + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ); configure(dbCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java index 9de2702..ba39e36 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java @@ -55,7 +55,7 @@ public class GridMarshallerMappingConsistencyTest extends GridCommonAbstractTest igniteCfg.setConsistentId(igniteInstanceName); DataRegionConfiguration drCfg = new DataRegionConfiguration(); - drCfg.setPersistenceEnabled(true); + drCfg.setPersistenceEnabled(true).setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE); DataStorageConfiguration dsCfg = new DataStorageConfiguration(); dsCfg.setDefaultDataRegionConfiguration(drCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index ca1a563..45833fb 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -859,6 +859,28 @@ public abstract class GridAbstractTest extends TestCase { } /** + * @param regionCfg Region config. + */ + private void validateDataRegion(DataRegionConfiguration regionCfg) { + if (regionCfg.isPersistenceEnabled() && regionCfg.getMaxSize() == DataStorageConfiguration.DFLT_DATA_REGION_MAX_SIZE) + throw new AssertionError("Max size of data region should be set explicitly to avoid memory over usage"); + } + + /** + * @param cfg Config. + */ + private void validateConfiguration(IgniteConfiguration cfg) { + if (cfg.getDataStorageConfiguration() != null) { + validateDataRegion(cfg.getDataStorageConfiguration().getDefaultDataRegionConfiguration()); + + if (cfg.getDataStorageConfiguration().getDataRegionConfigurations() != null) { + for (DataRegionConfiguration reg : cfg.getDataStorageConfiguration().getDataRegionConfigurations()) + validateDataRegion(reg); + } + } + } + + /** * Starts new grid with given name. * * @param igniteInstanceName Ignite instance name. http://git-wip-us.apache.org/repos/asf/ignite/blob/c00060ba/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java index 7d0a579..64819f3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java @@ -66,8 +66,12 @@ public class SqlUserCommandSelfTest extends GridCommonAbstractTest { cfg.setAuthenticationEnabled(true); cfg.setDataStorageConfiguration(new DataStorageConfiguration() - .setDefaultDataRegionConfiguration(new DataRegionConfiguration() - .setPersistenceEnabled(true))); + .setDefaultDataRegionConfiguration( + new DataRegionConfiguration() + .setPersistenceEnabled(true) + .setMaxSize(DataStorageConfiguration.DFLT_DATA_REGION_INITIAL_SIZE) + ) + ); return cfg; }
