IGNITE-6721: PDS & non PDS test fix, limiting persistent region size. - Fixes #3475.
authordpavlov <dpavlov@gridgain.com>
Tue, 6 Feb 2018 19:14:12 +0000 (22:14 +0300)
committerAlexey Goncharuk <alexey.goncharuk@gmail.com>
Tue, 6 Feb 2018 19:14:12 +0000 (22:14 +0300)
Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java

index 1015e52..dc3d018 100644 (file)
@@ -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);
 
index a3dc5a1..5aca92f 100644 (file)
@@ -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