ignite-5513 fix WalRecoveryTxLogicalRecordsTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48d862d4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48d862d4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48d862d4 Branch: refs/heads/ignite-5267-1 Commit: 48d862d499f2f2790d86adff95ae653825bfea3a Parents: 6dfd153 Author: Dmitriy Govorukhin <[email protected]> Authored: Fri Jun 16 11:20:34 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Fri Jun 16 11:20:34 2017 +0300 ---------------------------------------------------------------------- .../db/IgnitePdsMultiNodePutGetRestartTest.java | 2 ++ .../db/wal/IgniteWalRecoveryTest.java | 8 ++++++++ .../db/wal/WalRecoveryTxLogicalRecordsTest.java | 20 ++++++++++++++++++-- .../ignite/testsuites/IgnitePdsTestSuite.java | 4 ---- .../IgnitePdsWithIndexingCoreTestSuite.java | 6 ++++++ 5 files changed, 34 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/48d862d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java index d4c51fc..5bc2f2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java @@ -146,6 +146,8 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest try { IgniteEx ig = grid(0); + ig.active(true); + checkPutGetSql(ig, false); } finally { http://git-wip-us.apache.org/repos/asf/ignite/blob/48d862d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java index f4c732b..6b4907c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java @@ -578,6 +578,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest { try { IgniteEx ctrlGrid = startGrid(0); + ctrlGrid.active(true); + fork = true; IgniteEx cacheGrid = startGrid(1); @@ -626,6 +628,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest { try { IgniteEx ctrlGrid = startGrid(0); + ctrlGrid.active(true); + fork = true; IgniteEx cacheGrid = startGrid(1); @@ -681,6 +685,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest { try { IgniteEx ctrlGrid = startGrid(0); + ctrlGrid.active(true); + fork = true; IgniteEx cacheGrid = startGrid(1); @@ -719,6 +725,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest { try { IgniteEx ctrlGrid = startGrid(0); + ctrlGrid.active(true); + fork = true; IgniteEx cacheGrid = startGrid(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/48d862d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java index 4fb2191..a810ecd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java @@ -133,8 +133,6 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5513";); - deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false)); } @@ -275,6 +273,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { ignite = startGrid(); + ignite.active(true); + cache = ignite.cache(CACHE_NAME); for (int i = 0; i < txCnt; i++) { @@ -391,6 +391,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { // Check that iterator is valid after restart. ignite = startGrid(); + ignite.active(true); + cctx = ((IgniteEx)ignite).context().cache().cache(CACHE_NAME).context(); offh = cctx.offheap(); topVer = cctx.affinity().affinityTopologyVersion(); @@ -498,6 +500,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { public void testWalAfterPreloading() throws Exception { Ignite ignite = startGrid(); + ignite.active(true); + try { GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context() .cache().context().database(); @@ -520,6 +524,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { ignite = startGrid(); + ignite.active(true); + cache = ignite.cache(CACHE_NAME); for (int i = 0; i < entries; i++) @@ -542,6 +548,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { Ignite ignite = startGrid(0); + ignite.active(true); + GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context() .cache().context().database(); @@ -576,6 +584,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { ignite = startGrid(0); + ignite.active(true); + ignite.cache(CACHE_NAME).put(1, new IndexedValue(0)); } finally { @@ -614,6 +624,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { Ignite ignite = startGrid(0); + ignite.active(true); + if (pages != null) { List<Integer> curPags = allocatedPages(ignite, CACHE2_NAME); @@ -670,6 +682,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { Ignite ignite = startGrid(0); + ignite.active(true); + GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context() .cache().context().database(); @@ -774,6 +788,8 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { ignite = startGrid(0); + ignite.active(true); + cache1 = ignite.cache(CACHE_NAME); cache2 = ignite.cache(CACHE2_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/48d862d4/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java index 1236738..dd0c3e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java @@ -21,10 +21,6 @@ import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsClientNearCachePutGetTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDynamicCacheTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsSingleNodePutGetPersistenceTest; -import org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreCacheGroupsTest; -import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsMultiNodePutGetRestartTest; -import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsPageEvictionTest; -import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsCacheIntegrationTest; import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsEvictionTest; import org.apache.ignite.internal.processors.cache.persistence.db.file.ignitePdsCheckpointSimulationTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalDirectoriesConfigurationTest; http://git-wip-us.apache.org/repos/asf/ignite/blob/48d862d4/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 73327a4..eda99ce 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 @@ -38,6 +38,12 @@ public class IgnitePdsWithIndexingCoreTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite Persistent Store With Indexing Test Suite"); + suite.addTestSuite(IgnitePdsCacheIntegrationTest.class); + suite.addTestSuite(IgnitePdsPageEvictionTest.class); + suite.addTestSuite(IgnitePdsMultiNodePutGetRestartTest.class); + suite.addTestSuite(IgnitePersistentStoreCacheGroupsTest.class); + suite.addTestSuite(WalRecoveryTxLogicalRecordsTest.class); + suite.addTestSuite(IgniteWalRecoveryTest.class); suite.addTestSuite(IgnitePdsNoActualWalHistoryTest.class); suite.addTestSuite(IgnitePdsAtomicCacheRebalancingTest.class);
