[ignite] branch master updated: IGNITE-10766: MVCC: CacheMvccTxRecoveryTest.testCountersNeighborcastServerFailed unmutted. This closes #5943.

[gv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gvvinblade 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 625f917  IGNITE-10766: MVCC: CacheMvccTxRecoveryTest.testCountersNeighborcastServerFailed unmutted. This closes #5943.
625f917 is described below

commit 625f9173dcb09e4fb29120aefa920882dce54cd6
Author: ipavlukhin <vo...@gmail.com>
AuthorDate: Tue Jan 29 14:37:19 2019 +0300

    IGNITE-10766: MVCC: CacheMvccTxRecoveryTest.testCountersNeighborcastServerFailed unmutted. This closes #5943.
---
 .../dht/GridCachePartitionsStateValidationTest.java           |  4 +---
 .../processors/cache/mvcc/CacheMvccTxRecoveryTest.java        | 11 ++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
index d8f4c2c..e759e5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
@@ -51,12 +51,10 @@ import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.spi.IgniteSpiException;
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.testframework.MvccFeatureChecker;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
-import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -143,7 +141,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
      */
     @Test
     public void testPartitionCountersConsistencyOnExchange() throws Exception {
-        Assume.assumeFalse("https://issues.apache.org/jira/browse/IGNITE-10766", MvccFeatureChecker.forcedMvcc());
+        // Reopen https://issues.apache.org/jira/browse/IGNITE-10766 if starts failing with forced MVCC
 
         IgniteEx ignite = (IgniteEx) startGrids(4);
         ignite.cluster().active(true);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
index 10d5d36..b37c5e3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxRecoveryTest.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.IntPredicate;
 import java.util.stream.Collectors;
@@ -54,7 +55,6 @@ import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.plugin.extensions.communication.Message;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -401,9 +401,10 @@ public class CacheMvccTxRecoveryTest extends CacheMvccAbstractTest {
     /**
      * @throws Exception if failed.
      */
-    @Ignore("https://issues.apache.org/jira/browse/IGNITE-10766")
     @Test
     public void testCountersNeighborcastServerFailed() throws Exception {
+        // Reopen https://issues.apache.org/jira/browse/IGNITE-10766 if starts failing
+
         int srvCnt = 4;
 
         startGridsMultiThreaded(srvCnt);
@@ -479,13 +480,13 @@ public class CacheMvccTxRecoveryTest extends CacheMvccAbstractTest {
 
                 latch1.countDown();
 
-                latch2.await();
+                latch2.await(getTestTimeout(), TimeUnit.MILLISECONDS);
             }
 
             return null;
         });
 
-        latch1.await();
+        latch1.await(getTestTimeout(), TimeUnit.MILLISECONDS);
 
         // drop primary
         victim.close();
@@ -499,7 +500,7 @@ public class CacheMvccTxRecoveryTest extends CacheMvccAbstractTest {
 
         latch2.countDown();
 
-        backgroundTxFut.get();
+        backgroundTxFut.get(getTestTimeout());
 
         assertTrue(liveNodes.stream()
             .map(node -> node.cache(DEFAULT_CACHE_NAME).query(new SqlFieldsQuery("select * from Integer")).getAll())