GG-22572 Possible deadlock between exchange-worker and PartitionEvict…

…ionTask runner
gridgain · Aug 27, 2019 · 318f240 · 318f240
1 parent 73ba62f
commit 318f240
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/.../main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -39,6 +39,7 @@
 import org.apache.ignite.failure.FailureContext;
 import org.apache.ignite.failure.FailureType;
 import org.apache.ignite.internal.NodeStoppingException;
+import org.apache.ignite.internal.metric.IoStatisticsHolder;
 import org.apache.ignite.internal.pagemem.FullPageId;
 import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageMvccMarkUpdatedRecord;
 import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageMvccUpdateNewTxStateHintRecord;
@@ -92,7 +93,6 @@
 import org.apache.ignite.internal.processors.cache.tree.mvcc.search.MvccTreeClosure;
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.processors.query.GridQueryRowCacheCleaner;
-import org.apache.ignite.internal.metric.IoStatisticsHolder;
 import org.apache.ignite.internal.transactions.IgniteTxUnexpectedStateCheckedException;
 import org.apache.ignite.internal.util.GridAtomicLong;
 import org.apache.ignite.internal.util.GridCloseableIteratorAdapter;
@@ -1265,7 +1265,7 @@ protected CacheDataStore createCacheDataStore0(int p) throws IgniteCheckedExcept
     }
 
     /** {@inheritDoc} */
-    @Override public final void destroyCacheDataStore(CacheDataStore store) throws IgniteCheckedException {
+    @Override public void destroyCacheDataStore(CacheDataStore store) throws IgniteCheckedException {
         int p = store.partId();
 
         partStoreLock.lock(p);

diff --git a/...java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/...java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -836,20 +836,27 @@ private static boolean addPartition(
     }
 
     /** {@inheritDoc} */
-    @Override protected void destroyCacheDataStore0(CacheDataStore store) throws IgniteCheckedException {
-        assert ctx.database() instanceof GridCacheDatabaseSharedManager
-            : "Destroying cache data store when persistence is not enabled: " + ctx.database();
-
-        int partId = store.partId();
-
+    @Override public void destroyCacheDataStore(CacheDataStore store) throws IgniteCheckedException {
         ctx.database().checkpointReadLock();
 
         try {
-            saveStoreMetadata(store, null, true, false);
+            super.destroyCacheDataStore(store);
         }
         finally {
             ctx.database().checkpointReadUnlock();
         }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void destroyCacheDataStore0(CacheDataStore store) throws IgniteCheckedException {
+        assert ctx.database() instanceof GridCacheDatabaseSharedManager
+            : "Destroying cache data store when persistence is not enabled: " + ctx.database();
+
+        assert ctx.database().checkpointLockIsHeldByThread();
+
+        int partId = store.partId();
+
+        saveStoreMetadata(store, null, true, false);
 
         ((GridCacheDatabaseSharedManager)ctx.database()).schedulePartitionDestroy(grp.groupId(), partId);
     }