IGNITE-6721: PDS & non PDS test fix, limiting persistent region size. - Fixes #3475.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8bd98db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8bd98db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8bd98db Branch: refs/heads/ignite-7485-2 Commit: e8bd98dbaa1bb12e086f09b135b0d087df73769e Parents: 50213a0 Author: dpavlov <dpav...@gridgain.com> Authored: Tue Feb 6 22:14:12 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Feb 6 22:14:12 2018 +0300 ---------------------------------------------------------------------- .../PageEvictionMultinodeMixedRegionsTest.java | 5 ++-- .../ignite/testsuites/IgnitePdsTestSuite2.java | 27 ++++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e8bd98db/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java index 1015e52..dc3d018 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.GridTestUtils; /** - * + * Enables but not touches persistent region, checks page eviction and PDS+no PDS mode. */ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinodeTest { /** {@inheritDoc} */ @@ -34,7 +34,8 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode DataRegionConfiguration persReg = new DataRegionConfiguration() .setName("persisted") - .setPersistenceEnabled(true); + .setPersistenceEnabled(true) + .setMaxSize(128 * 1024 * 1024); // limit memory to save space on agents cfg.getDataStorageConfiguration().setDataRegionConfigurations(persReg); http://git-wip-us.apache.org/repos/asf/ignite/blob/e8bd98db/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 a3dc5a1..5aca92f 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 @@ -60,6 +60,8 @@ public class IgnitePdsTestSuite2 extends TestSuite { addRealPageStoreTests(suite); + addRealPageStoreTestsLongRunning(suite); + // BaselineTopology tests suite.addTestSuite(IgniteAllBaselineNodesOnlineFullApiSelfTest.class); suite.addTestSuite(IgniteOfflineBaselineNodeFullApiSelfTest.class); @@ -69,6 +71,23 @@ public class IgnitePdsTestSuite2 extends TestSuite { } /** + * Fills {@code suite} with PDS test subset, which operates with real page store, but requires long time to execute. + * + * @param suite suite to add tests into. + */ + public static void addRealPageStoreTestsLongRunning(TestSuite suite) { + suite.addTestSuite(IgnitePdsTransactionsHangTest.class); + + suite.addTestSuite(IgnitePdsPageEvictionDuringPartitionClearTest.class); + + // Rebalancing test + suite.addTestSuite(IgnitePdsContinuousRestartTest.class); + suite.addTestSuite(IgnitePdsContinuousRestartTest2.class); + + suite.addTestSuite(IgnitePdsContinuousRestartTestWithSharedGroupAndIndexes.class); + } + + /** * Fills {@code suite} with PDS test subset, which operates with real page store and does actual disk operations. * * @param suite suite to add tests into. @@ -81,22 +100,14 @@ public class IgnitePdsTestSuite2 extends TestSuite { // Metrics test. suite.addTestSuite(IgniteDataStorageMetricsSelfTest.class); - suite.addTestSuite(IgnitePdsTransactionsHangTest.class); - suite.addTestSuite(IgnitePdsRebalancingOnNotStableTopologyTest.class); suite.addTestSuite(IgnitePdsWholeClusterRestartTest.class); - suite.addTestSuite(IgnitePdsPageEvictionDuringPartitionClearTest.class); // Rebalancing test suite.addTestSuite(IgniteWalHistoryReservationsTest.class); - suite.addTestSuite(IgnitePdsContinuousRestartTest.class); - suite.addTestSuite(IgnitePdsContinuousRestartTest2.class); - - suite.addTestSuite(IgnitePdsContinuousRestartTestWithSharedGroupAndIndexes.class); - suite.addTestSuite(IgnitePersistentStoreDataStructuresTest.class); // Failover test
