You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2018/12/25 14:17:45 UTC
ignite git commit: IGNITE-10474: MVCC:
IgniteCacheConnectionRecovery10ConnectionsTest.testConnectionRecovery. This
closes #5698.
Repository: ignite
Updated Branches:
refs/heads/master a0164b471 -> 2dabbd2f7
IGNITE-10474: MVCC: IgniteCacheConnectionRecovery10ConnectionsTest.testConnectionRecovery. This closes #5698.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2dabbd2f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2dabbd2f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2dabbd2f
Branch: refs/heads/master
Commit: 2dabbd2f7c362ad140f5225fa777dc889a7d0d7c
Parents: a0164b4
Author: rkondakov <ko...@mail.ru>
Authored: Tue Dec 25 17:17:27 2018 +0300
Committer: Igor Seliverstov <gv...@gmail.com>
Committed: Tue Dec 25 17:17:27 2018 +0300
----------------------------------------------------------------------
.../IgniteCacheConnectionRecoveryTest.java | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2dabbd2f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
index 3c9925d..0edef90 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
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.junit.Test;
import org.junit.runner.RunWith;
@@ -44,6 +45,7 @@ import org.junit.runners.JUnit4;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -71,7 +73,7 @@ public class IgniteCacheConnectionRecoveryTest extends GridCommonAbstractTest {
cfg.setCacheConfiguration(
cacheConfiguration("cache1", TRANSACTIONAL),
- //cacheConfiguration("cache2", TRANSACTIONAL_SNAPSHOT), //TODO IGNITE-10474: add Mvcc cache after fix.
+ cacheConfiguration("cache2", TRANSACTIONAL_SNAPSHOT),
cacheConfiguration("cache3", ATOMIC));
return cfg;
@@ -116,15 +118,25 @@ public class IgniteCacheConnectionRecoveryTest extends GridCommonAbstractTest {
IgniteCache[] caches = {
node.cache("cache1"),
-// node.cache("cache2"), //TODO IGNITE-10474: add Mvcc cache after fix.
+ node.cache("cache2"),
node.cache("cache3")};
int iter = 0;
while (U.currentTimeMillis() < stopTime) {
try {
- for (IgniteCache cache : caches)
- cache.putAllAsync(data).get(15, SECONDS);
+ for (IgniteCache cache : caches) {
+ while (true) {
+ try {
+ cache.putAllAsync(data).get(15, SECONDS);
+
+ break;
+ }
+ catch (Exception e) {
+ MvccFeatureChecker.assertMvccWriteConflict(e);
+ }
+ }
+ }
CyclicBarrier b = barrierRef.get();