[ignite] branch master updated: IGNITE-11618 Not fail when transaction is concurrently rolled back - Fixes #6333.

[agoncharuk]

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

agoncharuk 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 3b53649  IGNITE-11618 Not fail when transaction is concurrently rolled 
back - Fixes #6333.
3b53649 is described below

commit 3b5364925e204fe17a6724870e877aa72131f1a1
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
AuthorDate: Mon Mar 25 12:58:16 2019 +0300

    IGNITE-11618 Not fail when transaction is concurrently rolled back - Fixes 
#6333.
    
    Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
---
 .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index e8ed7af..97a1f03 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -1204,7 +1204,8 @@ public final class GridDhtTxPrepareFuture extends 
GridCacheCompoundFuture<Ignite
             }
         }
         catch (GridCacheEntryRemovedException ignore) {
-            assert false : "Got removed exception on entry with dht local 
candidate: " + entries;
+            // Entry was unlocked by concurrent rollback.
+            onError(tx.rollbackException());
         }
 
         return null;