ignite-2.4.1-merge-master Fixed checkpoint read lock acquisition

gridgain · Dec 22, 2017 · 956092f · 956092f
1 parent 12ac4bb
commit 956092f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1717,8 +1717,8 @@ else if (cfg.getCacheMode() == REPLICATED) {
         final AffinityTopologyVersion topVer,
         final IgniteLogger log,
         final GridCacheContext cctx,
-        final @Nullable KeyCacheObject key,
-        final @Nullable IgniteCacheExpiryPolicy expiryPlc,
+        @Nullable final KeyCacheObject key,
+        @Nullable final IgniteCacheExpiryPolicy expiryPlc,
         boolean readThrough,
         boolean skipVals
     ) {
@@ -1731,6 +1731,8 @@ private void process(KeyCacheObject key, CacheObject val, GridCacheVersion ver,
                 while (true) {
                     GridCacheEntryEx entry = null;
 
+                    cctx.shared().database().checkpointReadLock();
+
                     try {
                         entry = colocated.entryEx(key, topVer);
 
@@ -1760,6 +1762,8 @@ private void process(KeyCacheObject key, CacheObject val, GridCacheVersion ver,
                     finally {
                         if (entry != null)
                             cctx.evicts().touch(entry, topVer);
+
+                        cctx.shared().database().checkpointReadUnlock();
                     }
                 }
             }