ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ag...@apache.org
Subject ignite git commit: IGNITE-8443 Transaction hangs when some error occurs during processing of GridNearLockRequest
Date Wed, 06 Jun 2018 09:55:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/master d638a095e -> a05f78f5e


IGNITE-8443 Transaction hangs when some error occurs during processing of GridNearLockRequest

Signed-off-by: Andrey Gura <agura@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a05f78f5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a05f78f5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a05f78f5

Branch: refs/heads/master
Commit: a05f78f5e36ef6be8418e73eb59e557f8cba39e2
Parents: d638a09
Author: Aleksey Plekhanov <plehanov.alex@gmail.com>
Authored: Wed Jun 6 12:52:12 2018 +0300
Committer: Andrey Gura <agura@apache.org>
Committed: Wed Jun 6 12:52:12 2018 +0300

----------------------------------------------------------------------
 .../dht/GridDhtTransactionalCacheAdapter.java        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a05f78f5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index e3e29b0..fe1aee9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht;
 import java.io.Externalizable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -1196,6 +1197,20 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V>
extends GridDhtCach
                 }
             }
 
+            try {
+                GridNearLockResponse res = createLockReply(nearNode,
+                    Collections.emptyList(),
+                    req,
+                    tx,
+                    tx != null ? tx.xidVersion() : req.version(),
+                    e);
+
+                sendLockReply(nearNode, null, req, res);
+            }
+            catch (Exception ex) {
+                U.error(log, "Failed to send response for request message: " + req, ex);
+            }
+
             return new GridDhtFinishedFuture<>(
                 new IgniteCheckedException(err, e));
         }


Mime
View raw message