[ignite] branch ignite-11704 updated: ignite-11704

[sboikov]

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 10d24bd  ignite-11704
10d24bd is described below

commit 10d24bdc128ee7472e4d5a320086643ccb88b3f5
Author: sboikov <sboi...@apache.org>
AuthorDate: Tue Jul 30 07:29:26 2019 +0300

    ignite-11704
---
 .../CacheRemoveWithTombstonesLoadTest.java         |  8 ++++++++
 .../distributed/CacheRemoveWithTombstonesTest.java | 22 ++++------------------
 .../ignite/testframework/MvccFeatureChecker.java   |  3 ++-
 3 files changed, 14 insertions(+), 19 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 2780132..cb144b9 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
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 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.Test;
 
@@ -76,6 +77,13 @@ public class CacheRemoveWithTombstonesLoadTest extends 
GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
+    @Override protected void beforeTestsStarted() throws Exception {
+        super.beforeTestsStarted();
+
+        
MvccFeatureChecker.skipIfNotSupported(MvccFeatureChecker.Feature.TOMBSTONES);
+    }
+
+    /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java
index dcd7f6c..cb4ad69 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.plugin.extensions.communication.Message;
 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.Test;
 
@@ -108,14 +109,6 @@ public class CacheRemoveWithTombstonesTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @Test
-    public void testRemoveAndRebalanceRaceTxMvcc() throws Exception {
-        testRemoveAndRebalanceRace(TRANSACTIONAL_SNAPSHOT, false);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
     public void testRemoveAndRebalanceRaceAtomic() throws Exception {
         testRemoveAndRebalanceRace(ATOMIC, false);
     }
@@ -134,16 +127,6 @@ public class CacheRemoveWithTombstonesTest extends 
GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     @Test
-    public void testRemoveAndRebalanceRaceTxMvccWithPersistence() throws 
Exception {
-        persistence = true;
-
-        testRemoveAndRebalanceRaceTxMvcc();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
     public void testRemoveAndRebalanceRaceAtomicWithPersistence() throws 
Exception {
         persistence = true;
 
@@ -162,6 +145,9 @@ public class CacheRemoveWithTombstonesTest extends 
GridCommonAbstractTest {
 
         IgniteCache<Integer, Integer> cache0 = 
ignite0.createCache(cacheConfiguration(atomicityMode));
 
+        if (MvccFeatureChecker.forcedMvcc())
+            expTombstone = false;
+
         LongMetric tombstoneMetric0 = ignite0.context().metric().registry(
                 cacheMetricsRegistryName(DEFAULT_CACHE_NAME, 
false)).findMetric("Tombstones");
 
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 1daeab4..dce8c8d 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,7 +47,8 @@ public class MvccFeatureChecker {
         EVICTION,
         EXPIRATION,
         METRICS,
-        INTERCEPTOR
+        INTERCEPTOR,
+        TOMBSTONES
     }
 
     /**