2.4.1-merge-master Fixed checkpoint lock acquisition

gridgain · Dec 20, 2017 · 003f033 · 003f033
1 parent f03ce99
commit 003f033
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...c/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/...c/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1589,6 +1589,8 @@ private boolean lockMultiple(IgniteInternalTx tx, Iterable<IgniteTxEntry> entrie
             GridCacheContext cacheCtx = txEntry1.context();
 
             while (true) {
+                cctx.database().checkpointReadLock();
+
                 try {
                     GridCacheEntryEx entry1 = txEntry1.cached();
 
@@ -1641,6 +1643,9 @@ private boolean lockMultiple(IgniteInternalTx tx, Iterable<IgniteTxEntry> entrie
 
                     throw new IgniteCheckedException("Entry lock has been cancelled for transaction: " + tx);
                 }
+                finally {
+                    cctx.database().checkpointReadUnlock();
+                }
             }
         }