ignite-2.4.1-merge-master Fixing checkpoint lock acquisition

gridgain · Dec 18, 2017 · 144c666 · 144c666
1 parent 66bca4d
commit 144c666
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -826,6 +826,8 @@ public String toString() {
                 }
 
                 if (e != null) {
+                    ctx.shared().database().checkpointReadLock();
+
                     try {
                         cacheVal = e.peek(modes.heap, modes.offheap, topVer, plc);
                     }
@@ -837,6 +839,8 @@ public String toString() {
                     }
                     finally {
                         ctx0.evicts().touch(e, null);
+
+                        ctx.shared().database().checkpointReadUnlock();
                     }
                 }
 

diff --git a/...java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/...java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -647,6 +647,8 @@ private void loadEntry(KeyCacheObject key,
             if (part.reserve()) {
                 GridCacheEntryEx entry = null;
 
+                ctx.shared().database().checkpointReadLock();
+
                 try {
                     long ttl = CU.ttlForLoad(plc);
 
@@ -678,6 +680,8 @@ private void loadEntry(KeyCacheObject key,
                         entry.context().evicts().touch(entry, topVer);
 
                     part.release();
+
+                    ctx.shared().database().checkpointReadUnlock();
                 }
             }
             else if (log.isDebugEnabled())

diff --git a/...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -347,6 +347,8 @@ private void onEntriesLocked() {
 
             ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(txEntry);
 
+            cctx.database().checkpointReadLock();
+
             try {
                 if ((txEntry.op() == CREATE || txEntry.op() == UPDATE) &&
                     txEntry.conflictExpireTime() == CU.EXPIRE_TIME_CALCULATE) {
@@ -509,6 +511,9 @@ else if (retVal)
             catch (GridCacheEntryRemovedException e) {
                 assert false : "Got entry removed exception while holding transactional lock on entry [e=" + e + ", cached=" + cached + ']';
             }
+            finally {
+                cctx.database().checkpointReadUnlock();
+            }
         }
     }