This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d2cd98b IGNITE-9215 Uncomment tests in multiple misc suites.
d2cd98b is described below
commit d2cd98bd49232bedf129c17e27ed0b3da5f0c3c5
Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
AuthorDate: Thu Jul 30 22:20:25 2020 +0300
IGNITE-9215 Uncomment tests in multiple misc suites.
Also allow atomic(ish) overwrite of compute-checkpointed data.
---
.../checkpoint/sharedfs/SharedFsCheckpointSpi.java | 37 +++-
.../ignite/internal/GridAffinityMappedTest.java | 13 +-
...PSelfTest.java => GridP2PAffinitySelfTest.java} | 10 +-
.../IgnitePdsClientNearCachePutGetTest.java | 2 +
.../IgnitePersistenceSequentialCheckpointTest.java | 2 +-
.../IgnitePersistentStoreCacheGroupsTest.java | 10 +-
.../db/file/IgnitePdsCheckpointSimpleTest.java | 1 -
.../wal/IgniteWalRecoverySeveralRestartsTest.java | 10 +
.../pagemem/PageIdDistributionTest.java | 8 +-
.../cache/transactions/TxDeadlockCauseTest.java | 19 +-
.../ignite/p2p/GridP2PTestTaskExecutionTest.java | 55 ------
...SharedFsCheckpointSpiMultiThreadedSelfTest.java | 183 ++++++++---------
.../AbstractDiscoveryRandomStartStopTest.java | 219 ---------------------
.../tcp/TcpDiscoveryConcurrentStartTest.java | 10 +-
.../tcp/TcpDiscoverySpiRandomStartStopTest.java | 33 ----
.../testsuites/IgniteComputeGridTestSuite.java | 7 +-
.../ignite/testsuites/IgniteP2PSelfTestSuite.java | 3 +-
.../ignite/testsuites/IgnitePdsTestSuite.java | 21 +-
.../ignite/testsuites/IgnitePdsTestSuite2.java | 45 +----
.../IgniteSpiCheckpointSelfTestSuite.java | 3 +-
.../IgniteSpiCommunicationSelfTestSuite.java | 5 +-
.../IgniteSpiDiscoverySelfTestSuite.java | 10 +-
.../testsuites/TxDeadlockDetectionTestSuite.java | 3 +-
.../IgnitePdsWithIndexingCoreTestSuite.java | 2 +
24 files changed, 204 insertions(+), 507 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
index 29a7ec1..3ede4a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.checkpoint.sharedfs;
import java.io.File;
import java.io.FileFilter;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
@@ -397,7 +398,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter
implements Checkpoin
File file = new File(folder, getUniqueFileName(key));
- if (file.exists())
+ if (file.exists()) {
try {
SharedFsCheckpointData data = SharedFsUtils.read(file, marsh,
log);
@@ -407,6 +408,9 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter
implements Checkpoin
null
: null;
}
+ catch (FileNotFoundException e) {
+ // Ignore.
+ }
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to unmarshal objects in
checkpoint file: " +
file.getAbsolutePath(), e);
@@ -414,6 +418,7 @@ public class SharedFsCheckpointSpi extends IgniteSpiAdapter
implements Checkpoin
catch (IOException e) {
throw new IgniteSpiException("Failed to read checkpoint file:
" + file.getAbsolutePath(), e);
}
+ }
return null;
}
@@ -437,17 +442,34 @@ public class SharedFsCheckpointSpi extends
IgniteSpiAdapter implements Checkpoin
while (!saved) {
File file = new File(folder, getUniqueFileName(key));
- if (file.exists()) {
+ if (file.exists() && !overwrite)
+ return false;
+
+ File tmpFile = new File(folder, getUniqueFileName(key) +
getUniqueFileName(Thread.currentThread().getName()));
+
+ if (tmpFile.exists()) {
if (!overwrite)
return false;
if (log.isDebugEnabled())
- log.debug("Overriding existing file: " +
file.getAbsolutePath());
+ log.warning("Overriding existing temp file: " +
tmpFile.getAbsolutePath());
}
try {
- SharedFsUtils.write(file, new SharedFsCheckpointData(state,
expireTime, host, key),
+ SharedFsUtils.write(tmpFile, new SharedFsCheckpointData(state,
expireTime, host, key),
marsh, log);
+
+ if (file.exists()) {
+ if (overwrite)
+ file.delete();
+ else
+ return false;
+ }
+
+ if (tmpFile.renameTo(file))
+ saved = true;
+ else
+ return false;
}
catch (IOException e) {
// Select next shared directory if exists, otherwise throw
exception
@@ -455,11 +477,14 @@ public class SharedFsCheckpointSpi extends
IgniteSpiAdapter implements Checkpoin
continue;
else
throw new IgniteSpiException("Failed to write checkpoint
data into file: " +
- file.getAbsolutePath(), e);
+ tmpFile.getAbsolutePath(), e);
}
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to marshal checkpoint
data into file: " +
- file.getAbsolutePath(), e);
+ tmpFile.getAbsolutePath(), e);
+ }
+ finally {
+ tmpFile.delete();
}
if (timeout > 0)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index f76122a..df143c8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -53,11 +53,12 @@ public class GridAffinityMappedTest extends
GridCommonAbstractTest {
else {
assert igniteInstanceName.endsWith("2") ||
igniteInstanceName.endsWith("3");
- CacheConfiguration cacheCfg = defaultCacheConfiguration();
+ CacheConfiguration<Object, Object> cacheCfg =
defaultCacheConfiguration();
cacheCfg.setCacheMode(PARTITIONED);
cacheCfg.setAffinity(new MockCacheAffinityFunction());
cacheCfg.setAffinityMapper(new MockCacheAffinityKeyMapper());
+ cacheCfg.setNodeFilter(node ->
node.attribute(GridCacheModuloAffinityFunction.IDX_ATTR) != null);
cfg.setCacheConfiguration(cacheCfg);
cfg.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR,
@@ -78,18 +79,16 @@ public class GridAffinityMappedTest extends
GridCommonAbstractTest {
* @throws IgniteCheckedException If failed.
*/
@Test
- public void testMappedAffinity() throws IgniteCheckedException {
+ public void testMappedAffinity() throws IgniteCheckedException,
InterruptedException {
Ignite g1 = grid(1);
Ignite g2 = grid(2);
Ignite g3 = grid(3);
- assert g1.configuration().getCacheConfiguration().length == 0;
- assert g2.configuration().getCacheConfiguration()[0].getCacheMode() ==
PARTITIONED;
- assert g3.configuration().getCacheConfiguration()[0].getCacheMode() ==
PARTITIONED;
-
ClusterNode first = g2.cluster().localNode();
ClusterNode second = g3.cluster().localNode();
+ awaitPartitionMapExchange(true, true, null);
+
//When MockCacheAfinity and MockCacheAffinityKeyMapper are set to
cache configuration we expect the following.
//Key 0 is mapped to partition 0, first node.
//Key 1 is mapped to partition 1, second node.
@@ -140,7 +139,7 @@ public class GridAffinityMappedTest extends
GridCommonAbstractTest {
private static class MockCacheAffinityKeyMapper implements
AffinityKeyMapper {
/** {@inheritDoc} */
@Override public Object affinityKey(Object key) {
- return key instanceof Integer ? 1 == (Integer)key ? key : 0 : key;
+ return key instanceof Integer ? ((1 == (Integer)key) ? key : 0) :
key;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridP2PAffinitySelfTest.java
similarity index 95%
rename from
modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
rename to
modules/core/src/test/java/org/apache/ignite/internal/GridP2PAffinitySelfTest.java
index bc4cd44..d6414a5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridP2PAffinitySelfTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.testframework.GridTestExternalClassLoader;
import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -41,12 +42,13 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
* Tests affinity and affinity mapper P2P loading.
*/
-public class GridAffinityP2PSelfTest extends GridCommonAbstractTest {
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-13267";)
+public class GridP2PAffinitySelfTest extends GridCommonAbstractTest {
/** */
- private static final String EXT_AFFINITY_MAPPER_CLS_NAME =
"org.apache.ignite.tests.p2p.GridExternalAffinityMapper";
+ private static final String EXT_AFFINITY_MAPPER_CLS_NAME =
"org.apache.ignite.tests.p2p.GridExternalAffinityKeyMapper";
/** */
- private static final String EXT_AFFINITY_CLS_NAME =
"org.apache.ignite.tests.p2p.GridExternalAffinity";
+ private static final String EXT_AFFINITY_CLS_NAME =
"org.apache.ignite.tests.p2p.GridExternalAffinityFunction";
/** URL of classes. */
private static final URL[] URLS;
@@ -69,7 +71,7 @@ public class GridAffinityP2PSelfTest extends
GridCommonAbstractTest {
/**
*
*/
- public GridAffinityP2PSelfTest() {
+ public GridP2PAffinitySelfTest() {
super(false);
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsClientNearCachePutGetTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsClientNearCachePutGetTest.java
index 8bc9155..b0b42d2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsClientNearCachePutGetTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsClientNearCachePutGetTest.java
@@ -18,10 +18,12 @@
package org.apache.ignite.internal.processors.cache.persistence;
import
org.apache.ignite.internal.processors.database.IgniteDbPutGetAbstractTest;
+import org.junit.Ignore;
/**
*
*/
+@Ignore("https://issues.apache.org/jira/browse/IGNITE-7510";)
public class IgnitePdsClientNearCachePutGetTest extends
IgniteDbPutGetAbstractTest {
/** {@inheritDoc} */
@Override protected int gridCount() {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistenceSequentialCheckpointTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistenceSequentialCheckpointTest.java
index 41091e9..9a23d60 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistenceSequentialCheckpointTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistenceSequentialCheckpointTest.java
@@ -36,6 +36,6 @@ public class IgnitePersistenceSequentialCheckpointTest
extends IgnitePersistentS
/** {@inheritDoc} */
@Override protected int entriesCount() {
- return 1000;
+ return 100;
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
index 9151bba..5bd211c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
@@ -362,7 +362,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends
GridCommonAbstractTest
IgniteCache<Object, Object> cache = node.cache(cacheName);
for (int i = 0; i < entriesCount(); i++)
- cache.put(i, new Person("" + i, cacheName));
+ cache.put(i, new Person(i, cacheName));
}
}
@@ -375,7 +375,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends
GridCommonAbstractTest
IgniteCache<Object, Object> cache = node.cache(cacheName);
for (int i = 0; i < entriesCount(); i++)
- assertEquals(new Person("" + i, cacheName), cache.get(i));
+ assertEquals(new Person(i, cacheName), cache.get(i));
assertEquals(entriesCount(), cache.size());
}
@@ -395,7 +395,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends
GridCommonAbstractTest
List<Cache.Entry<Integer, Person>> persons =
cache.query(qry.setArgs(cacheName)).getAll();
for (int i = 0; i < entriesCount(); i++)
- assertEquals(new Person("" + i, cacheName),
persons.get(i).getValue());
+ assertEquals(new Person(i, cacheName),
persons.get(i).getValue());
assertEquals(entriesCount(), persons.size());
}
@@ -495,7 +495,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends
GridCommonAbstractTest
/** */
@GridToStringInclude
@QuerySqlField(index = true, groups = "full_name")
- String fName;
+ int fName;
/** */
@GridToStringInclude
@@ -506,7 +506,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends
GridCommonAbstractTest
* @param fName First name.
* @param lName Last name.
*/
- public Person(String fName, String lName) {
+ public Person(int fName, String lName) {
this.fName = fName;
this.lName = lName;
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimpleTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimpleTest.java
index 017ba29..678296b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimpleTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimpleTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
* Puts data into grid, waits for checkpoint to start and then verifies data
*/
public class IgnitePdsCheckpointSimpleTest extends GridCommonAbstractTest {
-
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
index 4c4fd1f..e1e35ed 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -116,6 +117,9 @@ public class IgniteWalRecoverySeveralRestartsTest extends
GridCommonAbstractTest
*/
@Test
public void testWalRecoverySeveralRestarts() throws Exception {
+ if (MvccFeatureChecker.forcedMvcc())
+ return;
+
try {
IgniteEx ignite = startGrid(1);
@@ -172,6 +176,9 @@ public class IgniteWalRecoverySeveralRestartsTest extends
GridCommonAbstractTest
*/
@Test
public void testWalRecoveryWithDynamicCache() throws Exception {
+ if (MvccFeatureChecker.forcedMvcc())
+ return;
+
try {
IgniteEx ignite = startGrid(1);
@@ -226,6 +233,9 @@ public class IgniteWalRecoverySeveralRestartsTest extends
GridCommonAbstractTest
*/
@Test
public void testWalRecoveryWithDynamicCacheLargeObjects() throws Exception
{
+ if (MvccFeatureChecker.forcedMvcc())
+ return;
+
try {
IgniteEx ignite = startGrid(1);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java
index c54e3a2..ec93ed3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageIdDistributionTest.java
@@ -56,7 +56,7 @@ public class PageIdDistributionTest extends
GridCommonAbstractTest {
private static final int PARTS = 1024;
/** */
- private static final int PAGES = 10240;
+ private static final int PAGES = 4096;
/**
*
@@ -64,13 +64,13 @@ public class PageIdDistributionTest extends
GridCommonAbstractTest {
@Test
public void testDistributions() {
printPageIdDistribution(
- CU.cacheId("partitioned"), 1024, 10_000, 32, 2.5f);
+ CU.cacheId("partitioned"), PARTS, PAGES, 32, 2.5f);
printPageIdDistribution(
- CU.cacheId("partitioned"), 1024, 10_000, 64, 2.5f);
+ CU.cacheId("partitioned"), PARTS, PAGES, 64, 2.5f);
printPageIdDistribution(
- CU.cacheId(null), 1024, 10_000, 32, 2.5f);
+ CU.cacheId(null), PARTS, PAGES, 32, 2.5f);
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
index 34a7dec..9f9e169 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
@@ -96,8 +96,8 @@ public class TxDeadlockCauseTest extends
GridCommonAbstractTest {
startGrids(1);
for (TransactionIsolation isolation : TransactionIsolation.values()) {
- testCauseObject(1, 2, 1000, isolation, true);
- testCauseObject(1, 2, 1000, isolation, false);
+ checkCauseObject(1, 2, 1000, isolation, true);
+ checkCauseObject(1, 2, 1000, isolation, false);
}
}
@@ -109,8 +109,8 @@ public class TxDeadlockCauseTest extends
GridCommonAbstractTest {
startGrids(2);
for (TransactionIsolation isolation : TransactionIsolation.values()) {
- testCauseObject(2, 2, 1500, isolation, true);
- testCauseObject(2, 2, 1500, isolation, false);
+ checkCauseObject(2, 2, 1500, isolation, true);
+ checkCauseObject(2, 2, 1500, isolation, false);
}
}
@@ -126,8 +126,8 @@ public class TxDeadlockCauseTest extends
GridCommonAbstractTest {
startGrids(1);
for (TransactionIsolation isolation : TransactionIsolation.values()) {
- testCauseObject(1, 2, 1000, isolation, true);
- testCauseObject(1, 2, 1000, isolation, false);
+ checkCauseObject(1, 2, 1000, isolation, true);
+ checkCauseObject(1, 2, 1000, isolation, false);
}
}
@@ -143,8 +143,8 @@ public class TxDeadlockCauseTest extends
GridCommonAbstractTest {
startGrids(4);
for (TransactionIsolation isolation : TransactionIsolation.values()) {
- testCauseObject(2, 2, 2000, isolation, true);
- testCauseObject(2, 2, 2000, isolation, false);
+ checkCauseObject(2, 2, 2000, isolation, true);
+ checkCauseObject(2, 2, 2000, isolation, false);
}
}
@@ -157,8 +157,7 @@ public class TxDeadlockCauseTest extends
GridCommonAbstractTest {
* instead of {@link IgniteCache#get(java.lang.Object)} and
{@link IgniteCache#put(java.lang.Object, java.lang.Object)} operations sequence.
* @throws Exception If failed.
*/
- @Test
- public void testCauseObject(int nodes, final int keysCnt, final long
timeout, final TransactionIsolation isolation, final boolean oneOp) throws
Exception {
+ private void checkCauseObject(int nodes, final int keysCnt, final long
timeout, final TransactionIsolation isolation, final boolean oneOp) throws
Exception {
final Ignite ignite = grid(new Random().nextInt(nodes));
final IgniteCache<Integer, Account> cache =
ignite.cache(DEFAULT_CACHE_NAME);
diff --git
a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java
b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java
deleted file mode 100644
index b76a2ad..0000000
---
a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PTestTaskExecutionTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.p2p;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.compute.ComputeTaskFuture;
-import org.apache.ignite.internal.util.typedef.G;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Test;
-
-/**
- * Test executes GridP2PTestTask on the remote node.
- * Before running of test you MUST start at least one remote node.
- */
-public final class GridP2PTestTaskExecutionTest extends GridCommonAbstractTest
{
- /**
- * Method executes GridP2PTestTask.
- * @throws IgniteCheckedException If failed.
- */
- @Test
- public void testGridP2PTestTask() throws IgniteCheckedException {
- try (Ignite g = G.start()) {
- assert g != null;
-
- assert !g.cluster().forRemotes().nodes().isEmpty() : "Test
requires at least 1 remote node.";
-
- /* Execute GridP2PTestTask. */
- ComputeTaskFuture<Integer> fut = executeAsync(g.compute(),
GridP2PTestTask.class, 1);
-
- /* Wait for task completion. */
- Integer res = fut.get();
-
- X.println("Result of execution is: " + res);
-
- assert res > 0 : "Result of execution is: " + res + " for more
information see GridP2PTestJob";
- }
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
index b2ee904..3e38473 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
@@ -17,13 +17,13 @@
package org.apache.ignite.spi.checkpoint.sharedfs;
-import java.io.File;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.GridTestIoUtils;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
@@ -40,7 +40,7 @@ import org.junit.Test;
public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends
GridSpiAbstractTest<SharedFsCheckpointSpi> {
/** */
- private static final String PATH = "work/cp/test-shared-fs-multi-threaded";
+ private static final String PATH = "cp/test-shared-fs-multi-threaded";
/** */
private static final String CHECK_POINT_KEY = "testCheckpoint";
@@ -68,107 +68,114 @@ public class
GridSharedFsCheckpointSpiMultiThreadedSelfTest extends
*/
@Test
public void testSpi() throws Exception {
- final AtomicInteger writeFinished = new AtomicInteger();
+ try {
+ final AtomicInteger writeFinished = new AtomicInteger();
- final AtomicBoolean fail = new AtomicBoolean();
+ final AtomicBoolean fail = new AtomicBoolean();
- IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync(
- new Callable<Object>() {
- @Nullable @Override public Object call() throws Exception {
- try {
- byte[] state = createTestArray((byte)1);
+ IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync(
+ new Callable<Object>() {
+ @Nullable @Override public Object call() throws Exception {
+ try {
+ byte[] state = createTestArray((byte) 1);
- for (int i = 0; i < ITER_CNT; i++)
- getSpi().saveCheckpoint(CHECK_POINT_KEY, state, 0,
true);
+ for (int i = 0; i < ITER_CNT; i++)
+ getSpi().saveCheckpoint(CHECK_POINT_KEY,
GridTestIoUtils.serializeJdk(state), 0, true);
- return null;
- }
- finally {
- writeFinished.incrementAndGet();
+ return null;
+ }
+ finally {
+ writeFinished.incrementAndGet();
+ }
}
- }
- },
- THREAD_CNT,
- "writer-1"
- );
-
- IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync(
- new Callable<Object>() {
- @Nullable @Override public Object call() throws Exception {
- try {
- byte[] state = createTestArray((byte)2);
+ },
+ THREAD_CNT,
+ "writer-1"
+ );
+
+ IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync(
+ new Callable<Object>() {
+ @Nullable @Override public Object call() throws Exception {
+ try {
+ byte[] state = createTestArray((byte) 2);
- for (int i = 0; i < ITER_CNT; i++)
- getSpi().saveCheckpoint(CHECK_POINT_KEY, state, 0,
true);
+ for (int i = 0; i < ITER_CNT; i++)
+ getSpi().saveCheckpoint(CHECK_POINT_KEY,
GridTestIoUtils.serializeJdk(state), 0, true);
- return null;
- }
- finally {
- writeFinished.incrementAndGet();
+ return null;
+ }
+ finally {
+ writeFinished.incrementAndGet();
+ }
}
- }
- },
- THREAD_CNT,
- "writer-2"
- );
-
- IgniteInternalFuture fut3 = GridTestUtils.runMultiThreadedAsync(
- new Callable<Object>() {
- @Nullable @Override public Object call() throws Exception {
- while (writeFinished.get() < THREAD_CNT * 2) {
- try {
- byte[] state =
getSpi().loadCheckpoint(CHECK_POINT_KEY);
+ },
+ THREAD_CNT,
+ "writer-2"
+ );
+
+ IgniteInternalFuture fut3 = GridTestUtils.runMultiThreadedAsync(
+ new Callable<Object>() {
+ @Nullable @Override public Object call() throws Exception {
+ while (writeFinished.get() < THREAD_CNT * 2) {
+ try {
+ byte[] state =
getSpi().loadCheckpoint(CHECK_POINT_KEY);
+
+ if (state == null)
+ continue;
- if (state == null)
- continue;
+ state = GridTestIoUtils.deserializeJdk(state);
- assert state.length == ARRAY_SIZE;
+ assert state.length == ARRAY_SIZE;
- boolean has1 = false;
- boolean has2 = false;
+ boolean has1 = false;
+ boolean has2 = false;
- for (int j = 0; j < ARRAY_SIZE; j++) {
- switch (state[j]) {
- case 1:
- has1 = true;
+ for (int j = 0; j < ARRAY_SIZE; j++) {
+ switch (state[j]) {
+ case 1:
+ has1 = true;
- assert !has2;
+ assert !has2;
- break;
+ break;
- case 2:
- has2 = true;
+ case 2:
+ has2 = true;
- assert !has1;
+ assert !has1;
- break;
+ break;
- default:
- assert false : "Unexpected value in
state: " + state[j];
+ default:
+ assert false : "Unexpected value
in state: " + state[j];
+ }
}
+
+ info(">>>>>>> Checkpoint is fine.");
}
+ catch (Throwable e) {
+ error("Failed to load checkpoint: " +
e.getMessage());
- info(">>>>>>> Checkpoint is fine.");
+ fail.set(true);
+ }
}
- catch (Throwable e) {
- error("Failed to load checkpoint: " +
e.getMessage());
- fail.set(true);
- }
+ return null;
}
-
- return null;
- }
- },
- 1,
- "reader"
- );
-
- fut1.get();
- fut2.get();
- fut3.get();
-
- assert !fail.get();
+ },
+ 1,
+ "reader"
+ );
+
+ fut1.get();
+ fut2.get();
+ fut3.get();
+
+ assert !fail.get();
+ }
+ finally {
+ U.resolveWorkDirectory(U.defaultWorkDirectory(), PATH, true);
+ }
}
/**
@@ -182,22 +189,4 @@ public class
GridSharedFsCheckpointSpiMultiThreadedSelfTest extends
return res;
}
-
- /**
- * @param f Folder to delete.
- */
- void deleteFolder(File f) {
- for (File file : f.listFiles())
- if (file.isDirectory())
- deleteFolder(file);
- else
- file.delete();
-
- f.delete();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- deleteFolder(new File(U.getIgniteHome(), PATH));
- }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
deleted file mode 100644
index 72c5daf..0000000
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoveryRandomStartStopTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.Event;
-import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest;
-import org.junit.Test;
-
-/**
- * Base discovery random start-stop test class.
- * @param <T> Discovery spi type.
- */
-public abstract class AbstractDiscoveryRandomStartStopTest<T extends
DiscoverySpi> extends GridSpiAbstractTest<T> {
- /** */
- private static final int DFLT_MAX_INTERVAL = 10;
-
- /** */
- private volatile boolean semaphore = true;
-
- /** */
- private boolean isRunning;
-
- /** */
- private Pinger pinger;
-
- /** */
- private class Pinger extends Thread {
- /** */
- private final Object mux = new Object();
-
- /** */
- private volatile boolean canceled;
-
- /** {@inheritDoc} */
- @Override public void run() {
- while (!canceled) {
- try {
- if (getSpi() != null) {
- Collection<ClusterNode> nodes =
getSpi().getRemoteNodes();
-
- for (ClusterNode item : nodes) {
- boolean flag = getSpi().pingNode(item.id());
-
- if (flag) {
- info("Ping node [nodeId=" +
item.id().toString().toUpperCase() +
- ", pingResult=" + flag + ']');
- }
- else {
- info("***Error*** Ping node fail [nodeId=" +
item.id().toString().toUpperCase() +
- ", pingResult=" + flag + ']');
- }
- }
- }
- }
- catch (Exception e) {
- error("Can't get remote nodes list.", e);
- }
-
- synchronized (mux) {
- if (!canceled) {
- try {
- mux.wait(2000);
- }
- catch (InterruptedException e) {
- //No-op.
- }
- }
- }
- }
- }
-
- /** {@inheritDoc} */
- @Override public void interrupt() {
- synchronized (mux) {
- canceled = true;
-
- mux.notifyAll();
- }
-
- super.interrupt();
- }
- }
-
- /** */
- private class DiscoveryListener implements GridLocalEventListener {
- /** {@inheritDoc} */
- @Override public void onEvent(Event evt) {
- info("Discovery event [event=" + evt + ']');
- }
- }
-
- /** */
- protected AbstractDiscoveryRandomStartStopTest() {
- super(false);
- }
-
- /**
- * @return Max interval.
- */
- protected int getMaxInterval() {
- return DFLT_MAX_INTERVAL;
- }
-
- /**
- *
- */
- private class Waiter extends Thread {
- /** {@inheritDoc} */
- @Override public void run() {
- // Wait until Ok is pressed.
- JOptionPane.showMessageDialog(
- null,
- new JComponent[] {
- new JLabel("Test started."),
- new JLabel("Press OK to stop test.")
- },
- "Ignite",
- JOptionPane.INFORMATION_MESSAGE
- );
-
- semaphore = false;
- }
- }
-
- /**
- * @throws Exception If failed.
- */
- @SuppressWarnings({"BusyWait"})
- @Test
- public void testDiscovery() throws Exception {
- Random rand = new Random();
-
- new Waiter().start();
-
- while (semaphore) {
- int interval = rand.nextInt(getMaxInterval() - 1) + 1;
-
- toggleState();
-
- if (isRunning)
- info("Spi stopped for the interval of " + interval + "
seconds...");
- else
- info("Spi started for the interval of " + interval + "
seconds...");
-
- try {
- Thread.sleep(interval * 1000);
- }
- catch (InterruptedException e) {
- error("Got interrupted", e);
-
- break;
- }
- }
-
- info("Spi stopped...");
- }
-
- /**
- * @throws Exception If failed.
- */
- private void toggleState() throws Exception {
- if (isRunning)
- spiStop();
- else
- spiStart();
-
- isRunning = !isRunning;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- if (getSpiContext() != null)
- getSpiContext().addLocalEventListener(new DiscoveryListener());
-
- pinger = new Pinger();
-
- pinger.start();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- pinger.interrupt();
- }
-
- /** {@inheritDoc} */
- @Override protected Map<String, Serializable> getNodeAttributes() {
- Map<String, Serializable> attrs = new HashMap<>(1);
-
- attrs.put("testDiscoveryAttribute", new Date());
-
- return attrs;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
index 56293e7..f75da6a 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.spi.discovery.tcp;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.configuration.IgniteConfiguration;
+import
org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
@@ -36,6 +37,13 @@ public class TcpDiscoveryConcurrentStartTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+ TcpDiscoveryMulticastIpFinder finder = new
TcpDiscoveryMulticastIpFinder();
+
+
finder.setMulticastGroup(GridTestUtils.getNextMulticastGroup(getClass()));
+
finder.setMulticastPort(GridTestUtils.getNextMulticastPort(getClass()));
+
+ cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(finder));
+
cfg.setCacheConfiguration();
return cfg;
@@ -66,7 +74,7 @@ public class TcpDiscoveryConcurrentStartTest extends
GridCommonAbstractTest {
*/
@Test
public void testConcurrentStartClients() throws Exception {
- for (int i = 0; i < 20; i++) {
+ for (int i = 0; i < 10; i++) {
try {
startGrid(0);
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiRandomStartStopTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiRandomStartStopTest.java
deleted file mode 100644
index f5dbbc1..0000000
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiRandomStartStopTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.tcp;
-
-import org.apache.ignite.spi.discovery.AbstractDiscoveryRandomStartStopTest;
-import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-
-/**
- * Random start stop test for {@link TcpDiscoverySpi}.
- */
-@GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI")
-public class TcpDiscoverySpiRandomStartStopTest extends
- AbstractDiscoveryRandomStartStopTest<TcpDiscoverySpi> {
- /** {@inheritDoc} */
- @Override protected int getMaxInterval() {
- return 10;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 3682f6c..d427f90 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
import org.apache.ignite.internal.ClusterNodeMetricsSelfTest;
import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest;
+import org.apache.ignite.internal.GridAffinityMappedTest;
import org.apache.ignite.internal.GridAffinityNoCacheSelfTest;
import org.apache.ignite.internal.GridAffinitySelfTest;
import org.apache.ignite.internal.GridAlwaysFailoverSpiFailSelfTest;
@@ -52,6 +53,7 @@ import
org.apache.ignite.internal.GridNonHistoryMetricsSelfTest;
import
org.apache.ignite.internal.GridProjectionLocalJobMultipleArgumentsSelfTest;
import org.apache.ignite.internal.GridStopWithWaitSelfTest;
import org.apache.ignite.internal.GridTaskCancelSingleNodeSelfTest;
+import org.apache.ignite.internal.GridTaskExecutionContextSelfTest;
import org.apache.ignite.internal.GridTaskExecutionSelfTest;
import
org.apache.ignite.internal.GridTaskExecutionWithoutPeerClassLoadingSelfTest;
import org.apache.ignite.internal.GridTaskFailoverAffinityRunTest;
@@ -105,7 +107,7 @@ import org.junit.runners.Suite;
GridCancelUnusedJobSelfTest.class,
GridTaskJobRejectSelfTest.class,
GridTaskExecutionSelfTest.class,
- //GridTaskExecutionContextSelfTest.class,
+ GridTaskExecutionContextSelfTest.class,
GridTaskExecutionWithoutPeerClassLoadingSelfTest.class,
GridFailoverSelfTest.class,
GridTaskListenerSelfTest.class,
@@ -149,8 +151,7 @@ import org.junit.runners.Suite;
GridProjectionLocalJobMultipleArgumentsSelfTest.class,
GridAffinitySelfTest.class,
GridAffinityNoCacheSelfTest.class,
- //GridAffinityMappedTest.class,
- //GridAffinityP2PSelfTest.class,
+ GridAffinityMappedTest.class,
GridEventStorageRuntimeConfigurationSelfTest.class,
GridMultinodeRedeployContinuousModeSelfTest.class,
GridMultinodeRedeploySharedModeSelfTest.class,
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
index 0813094..eafb75a 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteP2PSelfTestSuite.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.internal.GridP2PAffinitySelfTest;
import org.apache.ignite.internal.RaceOnDeployClassesWithSameAliases;
import
org.apache.ignite.internal.managers.deployment.GridDeploymentMessageCountSelfTest;
import org.apache.ignite.p2p.DeploymentClassLoaderCallableTest;
@@ -48,6 +49,7 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
+ GridP2PAffinitySelfTest.class,
GridP2PDoubleDeploymentSelfTest.class,
GridP2PHotRedeploymentSelfTest.class,
GridP2PClassLoadingSelfTest.class,
@@ -59,7 +61,6 @@ import org.junit.runners.Suite;
GridP2PJobClassLoaderSelfTest.class,
GridP2PRecursionTaskSelfTest.class,
GridP2PLocalDeploymentSelfTest.class,
- //GridP2PTestTaskExecutionTest.class,
GridP2PTimeoutSelfTest.class,
GridP2PMissedResourceCacheSizeSelfTest.class,
GridP2PContinuousDeploymentSelfTest.class,
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 d57fa2a..6895a62 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
@@ -20,6 +20,7 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.ignite.internal.pagemem.impl.PageMemoryNoLoadSelfTest;
import org.apache.ignite.internal.processors.cache.ActiveOnStartPropertyTest;
import org.apache.ignite.internal.processors.cache.AutoActivationPropertyTest;
import
org.apache.ignite.internal.processors.cache.ClusterStateOnStartPropertyTest;
@@ -27,10 +28,12 @@ import
org.apache.ignite.internal.processors.cache.IgniteClusterActivateDeactiva
import
org.apache.ignite.internal.processors.cache.IgnitePdsDataRegionMetricsTxTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheConfigurationFileConsistencyCheckTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest;
+import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsClientNearCachePutGetTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDestroyCacheTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDestroyCacheWithoutCheckpointsTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDiscoDataHandlingInNewClusterTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDynamicCacheTest;
+import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsRemoveDuringRebalancingTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsSingleNodePutGetPersistenceTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsSporadicDataRecordsOnBackupTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsCacheRestoreTest;
@@ -38,6 +41,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsDataR
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsWithTtlTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsWithTtlTest2;
import
org.apache.ignite.internal.processors.cache.persistence.db.file.DefaultPageSizeBackwardsCompatibilityTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsCheckpointSimpleTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsCheckpointSimulationWithRealCpDisabledTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsPageReplacementTest;
import
org.apache.ignite.internal.processors.cache.persistence.metastorage.IgniteMetaStorageBasicTest;
@@ -45,6 +49,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.pagemem.BPlusTree
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.BPlusTreeReuseListPageMemoryImplTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.FillFactorMetricTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.IndexStoragePageMemoryImplTest;
+import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageIdDistributionTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImplNoLoadTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImplTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryLazyAllocationTest;
@@ -53,6 +58,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemor
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.PagesWriteThrottleSmokeTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.UsedPagesMetricTest;
import
org.apache.ignite.internal.processors.cache.persistence.pagemem.UsedPagesMetricTestPersistence;
+import
org.apache.ignite.internal.processors.cache.persistence.tree.io.TrackingPageIOTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.CpTriggeredWalDeltaConsistencyTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.ExplicitWalDeltaConsistencyTest;
import
org.apache.ignite.internal.processors.cache.persistence.wal.SegmentedRingByteBufferTest;
@@ -91,15 +97,15 @@ public class IgnitePdsTestSuite {
addRealPageStoreTestsLongRunning(suite, ignoredTests);
// Basic PageMemory tests.
- //GridTestUtils.addTestIfNeeded(suite, PageMemoryNoLoadSelfTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, PageMemoryNoLoadSelfTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, PageMemoryImplNoLoadTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, PageMemoryNoStoreLeakTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
PageMemoryLazyAllocationTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
PageMemoryLazyAllocationWithPDSTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IndexStoragePageMemoryImplTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, PageMemoryImplTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, PageIdDistributionTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite, TrackingPageIOTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, PageIdDistributionTest.class,
ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, TrackingPageIOTest.class,
ignoredTests);
// BTree tests with store page memory.
GridTestUtils.addTestIfNeeded(suite,
BPlusTreePageMemoryImplTest.class, ignoredTests);
@@ -152,11 +158,9 @@ public class IgnitePdsTestSuite {
* @param ignoredTests Ignored tests.
*/
public static void addRealPageStoreTests(List<Class<?>> suite,
Collection<Class> ignoredTests) {
-
// Checkpointing smoke-test.
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCheckpointSimulationWithRealCpDisabledTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCheckpointSimpleTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgnitePersistenceSequentialCheckpointTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCheckpointSimpleTest.class, ignoredTests);
// Basic API tests.
GridTestUtils.addTestIfNeeded(suite,
IgniteDbSingleNodePutGetTest.class, ignoredTests);
@@ -167,8 +171,7 @@ public class IgnitePdsTestSuite {
// Persistence-enabled.
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsSingleNodePutGetPersistenceTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, IgnitePdsDynamicCacheTest.class,
ignoredTests);
- // TODO uncomment when
https://issues.apache.org/jira/browse/IGNITE-7510 is fixed
- // GridTestUtils.addTestIfNeeded(suite,
IgnitePdsClientNearCachePutGetTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsClientNearCachePutGetTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteDbPutGetWithCacheStoreTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, IgnitePdsWithTtlTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, IgnitePdsWithTtlTest2.class,
ignoredTests);
@@ -181,7 +184,7 @@ public class IgnitePdsTestSuite {
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsDataRegionMetricsTxTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, IgnitePdsDestroyCacheTest.class,
ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgnitePdsRemoveDuringRebalancingTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgnitePdsRemoveDuringRebalancingTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsDestroyCacheWithoutCheckpointsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCacheConfigurationFileConsistencyCheckTest.class, ignoredTests);
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 f821d4e..375efe7 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
@@ -69,6 +69,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalH
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorExceptionDuringReadTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalIteratorSwitchSegmentTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRebalanceLoggingTest;
+import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalRecoverySeveralRestartsTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalReplayingAfterRestartTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalSerializerVersionTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionSwitchOnTest;
@@ -145,17 +146,11 @@ public class IgnitePdsTestSuite2 {
*/
private static void addRealPageStoreTestsNotForDirectIo(List<Class<?>>
suite, Collection<Class> ignoredTests) {
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsPartitionFilesDestroyTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
LocalWalModeChangeDuringRebalancingSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushFsyncSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushFsyncWithMmapBufferSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCacheStartStopWithFreqCheckpointTest.class, ignoredTests);
}
@@ -172,94 +167,58 @@ public class IgnitePdsTestSuite2 {
// Metrics test.
GridTestUtils.addTestIfNeeded(suite,
IgniteDataStorageMetricsSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsRebalancingOnNotStableTopologyTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsWholeClusterRestartTest.class, ignoredTests);
// Rebalancing test
GridTestUtils.addTestIfNeeded(suite,
IgniteWalHistoryReservationsTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
SlowHistoricalRebalanceSmallHistoryTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteShutdownOnSupplyMessageFailureTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePersistentStoreDataStructuresTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
FullHistRebalanceOnClientStopTest.class, ignoredTests);
// Failover test
GridTestUtils.addTestIfNeeded(suite, IgniteWalFlushFailoverTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushBackgroundWithMmapBufferSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlySelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalFormatFileFailoverTest.class, ignoredTests);
// Test suite uses Standalone WAL iterator to verify PDS content.
GridTestUtils.addTestIfNeeded(suite, IgniteWalReaderTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsExchangeDuringCheckpointTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsReserveWalSegmentsWithCompactionTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalReplayingAfterRestartTest.class, ignoredTests);
// new style folders with generated consistent ID test
GridTestUtils.addTestIfNeeded(suite,
IgniteUidAsConsistentIdMigrationTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalSerializerVersionTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, WalCompactionTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite, WalCompactionSwitchOnTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveFsyncTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
WalDeletionArchiveLogOnlyTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteCheckpointDirtyPagesForLowLoadTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsCorruptedStoreTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
CheckpointFailBeforeWriteMarkTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, CheckpointFreeListTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, CheckpointStartLoggingTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, FreeListCachingTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorSwitchSegmentTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWalIteratorExceptionDuringReadTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteNodeStoppedDuringDisableWALTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
StandaloneWalRecordsIteratorTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, FilteredWalIteratorTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, WalScannerTest.class,
ignoredTests);
-
- //GridTestUtils.addTestIfNeeded(suite,
IgniteWalRecoverySeveralRestartsTest.class, ignoredTests);
-
+ GridTestUtils.addTestIfNeeded(suite,
IgniteWalRecoverySeveralRestartsTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteRebalanceScheduleResendPartitionsTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgniteWALTailIsReachedDuringIterationOverArchiveTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite, WalRolloverTypesTest.class,
ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
FsyncWalRolloverDoesNotBlockTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
IgnitePdsPartitionsStateRecoveryTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
WalPreloadingConcurrentTest.class, ignoredTests);
-
GridTestUtils.addTestIfNeeded(suite,
WALPreloadingWithCompactionTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteWalRebalanceLoggingTest.class, ignoredTests);
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java
index bbed57d..e11daef 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCheckpointSelfTestSuite.java
@@ -26,6 +26,7 @@ import
org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpiCustomConfigSelfTe
import
org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpiDefaultConfigSelfTest;
import
org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpiStartStopSelfTest;
import
org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpiConfigSelfTest;
+import
org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpiMultiThreadedSelfTest;
import
org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpiMultipleDirectoriesSelfTest;
import
org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpiSelfTest;
import
org.apache.ignite.spi.checkpoint.sharedfs.GridSharedFsCheckpointSpiStartStopSelfTest;
@@ -53,7 +54,7 @@ import org.junit.runners.Suite;
GridSharedFsCheckpointSpiSelfTest.class,
GridSharedFsCheckpointSpiStartStopSelfTest.class,
GridSharedFsCheckpointSpiConfigSelfTest.class,
- //GridSharedFsCheckpointSpiMultiThreadedSelfTest.class,
+ GridSharedFsCheckpointSpiMultiThreadedSelfTest.class,
})
public class IgniteSpiCheckpointSelfTestSuite {
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java
index ab1bb87..9e24b64 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testsuites;
+import org.apache.ignite.spi.communication.tcp.GridCacheDhtLockBackupSelfTest;
import
org.apache.ignite.spi.communication.tcp.GridSandboxedClientWithoutNetworkTest;
import
org.apache.ignite.spi.communication.tcp.GridTcpCommunicationInverseConnectionEstablishingTest;
import
org.apache.ignite.spi.communication.tcp.GridTcpCommunicationSpiConcurrentConnectSelfTest;
@@ -107,9 +108,9 @@ import org.junit.runners.Suite;
GridTcpCommunicationInverseConnectionEstablishingTest.class,
GridTotallyUnreachableClientTest.class,
- GridSandboxedClientWithoutNetworkTest.class
+ GridSandboxedClientWithoutNetworkTest.class,
- //GridCacheDhtLockBackupSelfTest.class,
+ GridCacheDhtLockBackupSelfTest.class,
})
public class IgniteSpiCommunicationSelfTestSuite {
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
index 6771904..22feebf 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java
@@ -39,6 +39,7 @@ import
org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiMulticastTest;
import org.apache.ignite.spi.discovery.tcp.TcpClientDiscoverySpiSelfTest;
import
org.apache.ignite.spi.discovery.tcp.TcpClientDiscoveryUnresolvedHostTest;
import
org.apache.ignite.spi.discovery.tcp.TcpDiscoveryClientSuspensionSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryConcurrentStartTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryCoordinatorFailureTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryFailedJoinTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryIpFinderCleanerTest;
@@ -61,7 +62,9 @@ import
org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiFailureTimeoutSelfTest
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiMBeanTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiReconnectDelayTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiSslSelfTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiStartStopSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpiWildcardSelfTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslParametersTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSecuredUnsecuredTest;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySslSelfTest;
@@ -92,9 +95,8 @@ import static
org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP
TcpDiscoverySelfTest.class,
TcpDiscoverySpiSelfTest.class,
- //TcpDiscoverySpiRandomStartStopTest.class,
- //TcpDiscoverySpiSslSelfTest.class,
- //TcpDiscoverySpiWildcardSelfTest.class,
+ TcpDiscoverySpiSslSelfTest.class,
+ TcpDiscoverySpiWildcardSelfTest.class,
TcpDiscoverySpiFailureTimeoutSelfTest.class,
TcpDiscoverySpiMBeanTest.class,
TcpDiscoverySpiStartStopSelfTest.class,
@@ -121,7 +123,7 @@ import static
org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP
TcpDiscoveryRestartTest.class,
TcpDiscoveryMultiThreadedTest.class,
TcpDiscoveryMetricsWarnLogTest.class,
- //TcpDiscoveryConcurrentStartTest.class,
+ TcpDiscoveryConcurrentStartTest.class,
TcpDiscoverySegmentationPolicyTest.class,
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java
index 6814fc5..ada89cb 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java
@@ -18,6 +18,7 @@
package org.apache.ignite.testsuites;
import
org.apache.ignite.internal.processors.cache.transactions.DepthFirstSearchTest;
+import
org.apache.ignite.internal.processors.cache.transactions.TxDeadlockCauseTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxDeadlockDetectionMessageMarshallingTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxDeadlockDetectionNoHangsTest;
import
org.apache.ignite.internal.processors.cache.transactions.TxDeadlockDetectionTest;
@@ -40,7 +41,7 @@ import org.junit.runners.Suite;
TxOptimisticDeadlockDetectionCrossCacheTest.class,
TxPessimisticDeadlockDetectionTest.class,
TxPessimisticDeadlockDetectionCrossCacheTest.class,
- //TxDeadlockCauseTest.class,
+ TxDeadlockCauseTest.class,
TxDeadlockDetectionTest.class,
TxDeadlockDetectionNoHangsTest.class,
TxDeadlockDetectionUnmasrhalErrorsTest.class,
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 bf772fa..4f6b671 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
@@ -25,6 +25,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsCorrupte
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsMarshallerMappingRestoreOnNodeStartTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsTxCacheRebalancingTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePdsTxHistoricalRebalancingTest;
+import
org.apache.ignite.internal.processors.cache.persistence.IgnitePersistenceSequentialCheckpointTest;
import
org.apache.ignite.internal.processors.cache.persistence.IgnitePersistentStoreCacheGroupsTest;
import
org.apache.ignite.internal.processors.cache.persistence.PersistenceDirectoryWarningLoggingTest;
import
org.apache.ignite.internal.processors.cache.persistence.db.IgniteCacheGroupsWithRestartsTest;
@@ -58,6 +59,7 @@ import org.junit.runners.Suite;
IgnitePdsPageEvictionTest.class,
IgnitePdsMultiNodePutGetRestartTest.class,
IgnitePersistentStoreCacheGroupsTest.class,
+ IgnitePersistenceSequentialCheckpointTest.class,
PersistenceDirectoryWarningLoggingTest.class,
WalPathsTest.class,
WalRecoveryTxLogicalRecordsTest.class,
