[ignite] branch master updated: IGNITE-20141 Transaction will never become finished on timeout when deadlock detection is disabled. (#10872)

[av]

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

av 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 fa4ee042c97 IGNITE-20141 Transaction will never become finished on 
timeout when deadlock detection is disabled. (#10872)
fa4ee042c97 is described below

commit fa4ee042c978ee760190312df90fe22ca6773495
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Fri Aug 4 17:56:00 2023 +0300

    IGNITE-20141 Transaction will never become finished on timeout when 
deadlock detection is disabled. (#10872)
---
 .../distributed/dht/colocated/GridDhtColocatedLockFuture.java      | 7 ++++++-
 .../processors/cache/distributed/near/GridNearLockFuture.java      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 24dd8382b15..37d55334828 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -1556,8 +1556,13 @@ public final class GridDhtColocatedLockFuture extends 
GridCacheCompoundIdentityF
                         }
                     });
                 }
-                else
+                else {
                     err = tx.timeoutException();
+
+                    synchronized (this) {
+                        onComplete(false, true);
+                    }
+                }
             }
             else {
                 synchronized (this) {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 4eecb971a81..f6c8916c78b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1495,8 +1495,13 @@ public final class GridNearLockFuture extends 
GridCacheCompoundIdentityFuture<Bo
                         }
                     });
                 }
-                else
+                else {
                     err = tx.timeoutException();
+
+                    synchronized (this) {
+                        onComplete(false, true);
+                    }
+                }
             }
             else {
                 synchronized (this) {