This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-11704
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-11704 by this push:
new a6cd27d ignite-11704
a6cd27d is described below
commit a6cd27dbd0ec5a7e9d82d4904f6b30c2cb5d7b6e
Author: sboikov <[email protected]>
AuthorDate: Wed Jul 31 10:58:06 2019 +0300
ignite-11704
---
.../CacheRemoveWithTombstonesLoadTest.java | 19 ++++++++++++++-----
.../ignite/testframework/MvccFeatureChecker.java | 3 +--
.../ignite/testsuites/IgniteCacheMvccTestSuite9.java | 4 ++++
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java
index cb144b9..6b0aefd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.spi.metric.LongMetric;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assume;
import org.junit.Test;
import java.util.ArrayList;
@@ -80,7 +81,7 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
-
MvccFeatureChecker.skipIfNotSupported(MvccFeatureChecker.Feature.TOMBSTONES);
+ Assume.assumeFalse(MvccFeatureChecker.forcedMvcc());
}
/** {@inheritDoc} */
@@ -138,8 +139,8 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
Map<TestKey, TestValue> data = new HashMap<>();
- final int KEYS = 10_000;
- final int ADD_NODES = 3;
+ final int KEYS = persistence ? 5_000 : 10_000;
+ final int ADD_NODES = persistence ? 2 : 3;
for (int i = 0; i < KEYS; i++) {
TestKey key = new TestKey(i, new byte[rnd.nextInt(pageSize * 3)]);
@@ -164,7 +165,7 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
}
});
- long endTime = System.currentTimeMillis() + 5000;
+ long endTime = System.currentTimeMillis() + 2500;
while (System.currentTimeMillis() < endTime) {
for (int i = 0; i < 100; i++) {
@@ -180,6 +181,8 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
cache0.put(key, val);
data.put(key, val);
}
+
+ Thread.sleep(10);
}
}
@@ -209,7 +212,7 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
}
});
- long endTime = System.currentTimeMillis() + 5000;
+ long endTime = System.currentTimeMillis() + 2500;
while (System.currentTimeMillis() < endTime) {
for (int i = 0; i < 100; i++) {
@@ -226,6 +229,8 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
data.put(key, val);
}
}
+
+ Thread.sleep(10);
}
fut.get(30_000);
@@ -238,6 +243,10 @@ public class CacheRemoveWithTombstonesLoadTest extends
GridCommonAbstractTest {
}
}
+ /**
+ * @param keys Keys to check.
+ * @param data Expected data.
+ */
private void checkData(List<TestKey> keys, Map<TestKey, TestValue> data) {
for (Ignite node : Ignition.allGrids()) {
if (!node.name().endsWith("CacheRemoveWithTombstonesLoadTest1"))
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
index dce8c8d..1daeab4 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java
@@ -47,8 +47,7 @@ public class MvccFeatureChecker {
EVICTION,
EXPIRATION,
METRICS,
- INTERCEPTOR,
- TOMBSTONES
+ INTERCEPTOR
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
index 243fb4b..e5dff20 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteSystemProperties;
import
org.apache.ignite.internal.processors.cache.IgniteCacheGetCustomCollectionsSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheLoadRebalanceEvictionSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.CacheAtomicPrimarySyncBackPressureTest;
+import
org.apache.ignite.internal.processors.cache.distributed.CacheRemoveWithTombstonesLoadTest;
import
org.apache.ignite.internal.processors.cache.distributed.IgniteCachePrimarySyncTest;
import
org.apache.ignite.internal.processors.cache.distributed.IgniteTxCachePrimarySyncTest;
import
org.apache.ignite.internal.processors.cache.distributed.IgniteTxConcurrentRemoveObjectsTest;
@@ -88,6 +89,9 @@ public class IgniteCacheMvccTestSuite9 {
ignoredTests.add(IoStatisticsCacheSelfTest.class);
ignoredTests.add(IoStatisticsCachePersistenceSelfTest.class);
+ // Tombstones are not created with mvcc.
+ ignoredTests.add(CacheRemoveWithTombstonesLoadTest.class);
+
return new ArrayList<>(IgniteCacheTestSuite9.suite(ignoredTests));
}
}
