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 2019/01/31 17:34:11 UTC
[ignite] branch master updated: IGNITE-10183: MVCC:
IgniteClientReconnectCacheTest.testReconnectOperationInProgress fixed. This
closes #5797.
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 552f6e4 IGNITE-10183: MVCC: IgniteClientReconnectCacheTest.testReconnectOperationInProgress fixed. This closes #5797.
552f6e4 is described below
commit 552f6e400b9519efc28359ec5269bf9cc1c055d8
Author: rkondakov <ko...@mail.ru>
AuthorDate: Thu Jan 31 20:33:50 2019 +0300
IGNITE-10183: MVCC: IgniteClientReconnectCacheTest.testReconnectOperationInProgress fixed. This closes #5797.
Signed-off-by: ipavlukhin <vo...@gmail.com>
---
.../internal/IgniteClientReconnectCacheTest.java | 26 ++++++++++++++++++++--
.../ignite/testframework/MvccFeatureChecker.java | 2 +-
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index a5c1a27..5ceca8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -70,6 +70,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.spi.discovery.DiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -840,7 +841,19 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
IgniteInClosure<IgniteCache<Object, Object>> putOp = new CI1<IgniteCache<Object, Object>>() {
@Override public void apply(IgniteCache<Object, Object> cache) {
- cache.put(1, 1);
+ while (true) {
+ try {
+ cache.put(1, 1);
+
+ break;
+ }
+ catch (Exception e) {
+ if (e.getCause() instanceof IgniteClientDisconnectedException)
+ throw e;
+ else
+ MvccFeatureChecker.assertMvccWriteConflict(e);
+ }
+ }
}
};
@@ -1444,7 +1457,16 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
assertNotEquals(id, client.localNode().id());
- cache.put(1, 1);
+ while (true) {
+ try {
+ cache.put(1, 1);
+
+ break;
+ }
+ catch (Exception e) {
+ MvccFeatureChecker.assertMvccWriteConflict(e);
+ }
+ }
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
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 7ec04bb..4843665 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
@@ -135,7 +135,7 @@ public class MvccFeatureChecker {
public static void assertMvccWriteConflict(Exception e) {
IgniteSQLException sqlEx = X.cause(e, IgniteSQLException.class);
- if (sqlEx == null || sqlEx.statusCode() != TRANSACTION_SERIALIZATION_ERROR)
+ if (sqlEx == null || sqlEx.statusCode() != TRANSACTION_SERIALIZATION_ERROR)
fail("Unexpected exception: " + X.getFullStackTrace(e));
}