GG-39117 destroy updateLogTree in volatile storage (apache#846)

isapego · Jun 19, 2024 · 8ebb622 · 8ebb622
1 parent 87a51bb
commit 8ebb622
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/...in/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryTableStorage.java b/...in/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryTableStorage.java
@@ -196,7 +196,8 @@ CompletableFuture<Void> clearStorageAndUpdateDataStructures(AbstractPageMemoryMv
         volatilePartitionStorage.updateDataStructures(
                 createVersionChainTree(partitionId),
                 createIndexMetaTree(partitionId),
-                createGarbageCollectionTree(partitionId)
+                createGarbageCollectionTree(partitionId),
+                createUpdateLogTree(partitionId)
         );
 
         return nullCompletedFuture();

diff --git a/...rg/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java b/...rg/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
@@ -819,6 +819,7 @@ protected List<AutoCloseable> getResourcesToClose() {
         RenewablePartitionStorageState localState = renewableState;
 
         resources.add(destructionExecutor::close);
+        resources.add(updateLogTree::close);
         resources.add(localState.versionChainTree()::close);
         resources.add(localState.indexMetaTree()::close);
         resources.add(localState.gcQueue()::close);

diff --git a/.../apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java b/.../apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorage.java
@@ -474,6 +474,7 @@ List<AutoCloseable> getResourcesToCloseOnCleanup() {
                 localState.indexMetaTree()::close,
                 localState.gcQueue()::close,
                 localState.tombstonesTree()::close,
+                updateLogTree::close,
                 blobStorage::close
         );
     }

diff --git a/...rg/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java b/...rg/apache/ignite/internal/storage/pagememory/mv/VolatilePageMemoryMvPartitionStorage.java
@@ -237,6 +237,7 @@ public CompletableFuture<Void> destroyStructures() {
                 startMvDataDestruction(localState),
                 startIndexMetaTreeDestruction(localState),
                 startGarbageCollectionTreeDestruction(localState),
+                startUpdateLogTreeDestruction(),
                 indexes.destroyStructures()
         );
 
@@ -329,6 +330,19 @@ private CompletableFuture<Void> startGarbageCollectionTreeDestruction(RenewableP
                 });
     }
 
+    private CompletableFuture<Void> startUpdateLogTreeDestruction() {
+        return destroyTree(updateLogTree, null)
+                .whenComplete((res, e) -> {
+                    if (e != null) {
+                        LOG.error(
+                                "Update log tree destruction failed: [tableId={}, partitionId={}]",
+                                e,
+                                tableStorage.getTableId(), partitionId
+                        );
+                    }
+                });
+    }
+
     private <T> CompletableFuture<Void> destroyTree(BplusTree<T, ?> target, @Nullable Consumer<T> consumer) {
         try {
             GradualTask task = target.startGradualDestruction(consumer, false, VolatilePageMemoryStorageEngine.MAX_DESTRUCTION_WORK_UNITS);
@@ -346,7 +360,8 @@ List<AutoCloseable> getResourcesToCloseOnCleanup() {
         return List.of(
                 localState.versionChainTree()::close,
                 localState.indexMetaTree()::close,
-                localState.gcQueue()::close
+                localState.gcQueue()::close,
+                updateLogTree::close
         );
     }
 
@@ -356,12 +371,14 @@ List<AutoCloseable> getResourcesToCloseOnCleanup() {
      * @param versionChainTree Table tree for {@link VersionChain}.
      * @param indexMetaTree Tree that contains SQL indexes' metadata.
      * @param gcQueue Garbage collection queue.
+     * @param updateLogTree Update log tree.
      * @throws StorageException If failed.
      */
     public void updateDataStructures(
             VersionChainTree versionChainTree,
             IndexMetaTree indexMetaTree,
-            GcQueue gcQueue
+            GcQueue gcQueue,
+            UpdateLogTree updateLogTree
     ) {
         throwExceptionIfStorageNotInCleanupOrRebalancedState(state.get(), this::createStorageInfo);
 
@@ -374,6 +391,8 @@ public void updateDataStructures(
                 gcQueue,
                 null
         );
+
+        this.updateLogTree = updateLogTree;
     }
 
     @Override

diff --git a/...a/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java b/...a/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
@@ -48,7 +48,6 @@
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -225,7 +224,6 @@ void tableStorageDestructionFreesSortedIndexPages() throws Exception {
     }
 
     @Test
-    @Disabled("GG-39117")
     public void testDestroyTablesNoLeakages() {
         int limit = 100000;
         for (int i = 1; i < limit; i++) {