IGNITE-24421 Move checkpoint dir to NodeFileTree (#11854)

apache · Feb 6, 2025 · 2166e3a · 2166e3a
1 parent 2332899
commit 2166e3a
Show file tree

Hide file tree

Showing 40 changed files with 233 additions and 356 deletions.
diff --git a/.../java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java b/.../java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
@@ -16,6 +16,7 @@
  */
 package org.apache.ignite.internal.benchmarks.jol;
 
+import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,6 +36,7 @@
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.openjdk.jol.info.GraphLayout;
@@ -69,7 +71,7 @@ private void cleanPersistenceDir() throws Exception {
 
         SharedFileTree sft = new SharedFileTree(U.defaultWorkDirectory());
 
-        U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "cp", false));
+        U.delete(new File(sft.root(), SharedFsCheckpointSpi.DFLT_ROOT));
         U.delete(sft.marshaller().getParentFile());
     }
 

diff --git a/...g/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java b/...g/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.compatibility.testframework.junits.IgniteCompatibilityAbstractTest;
 import org.apache.ignite.compatibility.testframework.util.CompatibilityTestsUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
 
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 import static org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.BINARY_METADATA_DIR;
@@ -34,7 +35,7 @@
 public abstract class IgnitePersistenceCompatibilityAbstractTest extends IgniteCompatibilityAbstractTest {
     /** Persistence directories. */
     private static final List<String> PERSISTENCE_DIRS
-        = Arrays.asList(DFLT_STORE_DIR, BINARY_METADATA_DIR, "cp", MARSHALLER_DIR);
+        = Arrays.asList(DFLT_STORE_DIR, BINARY_METADATA_DIR, SharedFsCheckpointSpi.DFLT_ROOT, MARSHALLER_DIR);
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {

diff --git a/...apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java b/...apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
@@ -32,7 +32,7 @@
 import org.apache.ignite.configuration.WALMode;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
-import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.junit.Test;
@@ -122,14 +122,9 @@ private void doTestStartupWithOldVersion(String ver) throws Exception {
 
             int expCompressedWalSegments = PAYLOAD_SIZE * ENTRIES * 4 / WAL_SEGMENT_SIZE - 1;
 
-            String nodeFolderName = ignite.context().pdsFolderResolver().resolveFolders().folderName();
+            NodeFileTree ft = ignite.context().pdsFolderResolver().fileTree();
 
-            File dbDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false);
-            File walDir = new File(dbDir, "wal");
-            File archiveDir = new File(walDir, "archive");
-            File nodeArchiveDir = new File(archiveDir, nodeFolderName);
-
-            File[] compressedSegments = nodeArchiveDir.listFiles(new FilenameFilter() {
+            File[] compressedSegments = ft.walArchive().listFiles(new FilenameFilter() {
                 @Override public boolean accept(File dir, String name) {
                     return name.endsWith(".wal.zip");
                 }
@@ -142,15 +137,12 @@ private void doTestStartupWithOldVersion(String ver) throws Exception {
 
             stopAllGrids();
 
-            File nodeLfsDir = new File(dbDir, nodeFolderName);
-            File cpMarkersDir = new File(nodeLfsDir, "cp");
-
-            File[] cpMarkers = cpMarkersDir.listFiles();
+            File[] cpMarkers = ft.checkpoint().listFiles();
 
             assertNotNull(cpMarkers);
             assertTrue(cpMarkers.length > 0);
 
-            File cacheDir = new File(nodeLfsDir, "cache-" + TEST_CACHE_NAME);
+            File cacheDir = new File(ft.nodeStorage(), "cache-" + TEST_CACHE_NAME);
             File[] partFiles = cacheDir.listFiles(new FilenameFilter() {
                 @Override public boolean accept(File dir, String name) {
                     return name.startsWith("part");

diff --git a/...e/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java b/...e/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
@@ -51,6 +51,7 @@
 import org.apache.ignite.internal.management.cache.IdleVerifyResult;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
 import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIO;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
 import org.apache.ignite.internal.processors.compress.CompressionProcessor;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.G;
@@ -288,10 +289,12 @@ public void testRestoreNotCompressed_OnGridWithoutCompression() throws Exception
                     continue;
                 }
 
-                U.delete(U.resolveWorkDirectory(dir.toString(), "cp", false));
-                U.delete(U.resolveWorkDirectory(dir.toString(), DFLT_STORE_DIR, false));
-                U.delete(nodeFileTree(dir.toString()).marshaller());
-                U.delete(nodeFileTree(dir.toString()).binaryMetaRoot());
+                NodeFileTree ft = nodeFileTree(dir.toString());
+
+                U.delete(ft.checkpoint());
+                U.delete(ft.nodeStorage().getParentFile());
+                U.delete(ft.marshaller());
+                U.delete(ft.binaryMetaRoot());
             }
         }
         catch (IOException e) {

diff --git a/...che/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java b/...che/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.transform;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -40,7 +41,6 @@
 import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.T3;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.metric.MetricRegistry;
 import org.apache.ignite.spi.communication.CommunicationSpi;
 import org.apache.ignite.spi.metric.LongMetric;
@@ -49,7 +49,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 import static org.apache.ignite.internal.processors.metric.GridMetricManager.CLIENT_CONNECTOR_METRICS;
 import static org.apache.ignite.internal.util.nio.GridNioServer.RECEIVED_BYTES_METRIC_NAME;
 import static org.apache.ignite.internal.util.nio.GridNioServer.SENT_BYTES_METRIC_NAME;
@@ -361,10 +360,10 @@ private Consumption doTest(int cnt, Function<Integer, Object> keyGen, Function<I
 
                 mem += metrics.getTotalAllocatedSize();
 
-                String nodeFolder = ((IgniteEx)node).context().pdsFolderResolver().resolveFolders().folderName();
+                File nodeFolder = ((IgniteEx)node).context().pdsFolderResolver().fileTree().nodeStorage();
 
-                pers += FileUtils.sizeOfDirectory(
-                    U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR + "/" + nodeFolder, false));
+                if (nodeFolder != null)
+                    pers += FileUtils.sizeOfDirectory(nodeFolder);
 
                 if (mode != ConsumptionTestMode.PERSISTENT)
                     assertEquals(0, pers);

diff --git a/...c/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java b/...c/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
@@ -54,7 +54,6 @@
 import org.apache.ignite.internal.pagemem.PageIdAllocator;
 import org.apache.ignite.internal.processors.cache.persistence.IndexStorageImpl;
 import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStore;
-import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
 import org.apache.ignite.internal.processors.query.QueryUtils;
 import org.apache.ignite.internal.util.GridStringBuilder;
@@ -228,7 +227,7 @@ protected void prepareWorkDir() throws Exception {
         try (IgniteEx node = startGrid(0)) {
             populateData(node, null);
 
-            workDir = ((FilePageStoreManager)node.context().cache().context().pageStore()).workDir();
+            workDir = node.context().pdsFolderResolver().fileTree().nodeStorage();
         }
     }
 

diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -103,6 +103,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.diagnostic.pagelocktracker.dumpprocessors.ToFileDumpProcessor;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.DataStreamerUpdatesHandler;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
 import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyTaskResult;
@@ -328,10 +329,7 @@ private File startGridAndPutNodeToMaintenance(CacheConfiguration[] cachesToStart
         IgniteEx ig0 = startGrid(0);
         IgniteEx ig1 = startGrid(1);
 
-        String ig1Folder = ig1.context().pdsFolderResolver().resolveFolders().folderName();
-        File dbDir = U.resolveWorkDirectory(ig1.configuration().getWorkDirectory(), "db", false);
-
-        File ig1LfsDir = new File(dbDir, ig1Folder);
+        NodeFileTree ft1 = ig1.context().pdsFolderResolver().fileTree();
 
         ig0.cluster().baselineAutoAdjustEnabled(false);
         ig0.cluster().state(ACTIVE);
@@ -362,7 +360,7 @@ private File startGridAndPutNodeToMaintenance(CacheConfiguration[] cachesToStart
 
         stopGrid(1);
 
-        File[] cpMarkers = new File(ig1LfsDir, "cp").listFiles();
+        File[] cpMarkers = ft1.checkpoint().listFiles();
 
         for (File cpMark : cpMarkers) {
             if (cpMark.getName().contains("-END"))
@@ -371,7 +369,7 @@ private File startGridAndPutNodeToMaintenance(CacheConfiguration[] cachesToStart
 
         assertThrows(log, () -> startGrid(1), Exception.class, null);
 
-        return ig1LfsDir;
+        return ft1.nodeStorage();
     }
 
     /**

diff --git a/...core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTask.java b/...core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTask.java
@@ -110,7 +110,7 @@ private PersistenceTaskResult backup(PersistenceTaskArg arg) {
             MaintenanceRegistry mntcReg = ignite.context().maintenanceRegistry();
             MaintenanceTask task = mntcReg.activeMaintenanceTask(CORRUPTED_DATA_FILES_MNTC_TASK_NAME);
 
-            File workDir = ((FilePageStoreManager)ignite.context().cache().context().pageStore()).workDir();
+            File workDir = ignite.context().pdsFolderResolver().fileTree().nodeStorage();
 
             if (arg instanceof PersistenceBackupAllTaskArg)
                 return backupAll(workDir);

diff --git a/...g/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/...g/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -566,7 +566,8 @@ private DataRegionConfiguration createDefragmentationMappingRegionConfig(long re
                 kernalCtx.cache(),
                 () -> cpFreqDeviation.getOrDefault(DEFAULT_CHECKPOINT_DEVIATION),
                 kernalCtx.pools().getSystemExecutorService(),
-                kernalCtx.marshallerContext().jdkMarshaller()
+                kernalCtx.marshallerContext().jdkMarshaller(),
+                kernalCtx.pdsFolderResolver().fileTree()
             );
 
             final NodeFileLockHolder preLocked = kernalCtx.pdsFolderResolver()
@@ -745,8 +746,9 @@ private void acquireFileLock(NodeFileLockHolder preLocked) throws IgniteCheckedE
         if (cctx.kernalContext().clientNode())
             return;
 
-        fileLockHolder = preLocked == null ?
-            new NodeFileLockHolder(storeMgr.workDir().getPath(), cctx.kernalContext(), log) : preLocked;
+        fileLockHolder = preLocked == null
+            ? new NodeFileLockHolder(cctx.kernalContext().pdsFolderResolver().fileTree().nodeStorage().getPath(), cctx.kernalContext(), log)
+            : preLocked;
 
         if (!fileLockHolder.isLocked()) {
             if (log.isDebugEnabled())
@@ -1314,7 +1316,9 @@ else if (regCfg.getPageEvictionMode() != DataPageEvictionMode.DISABLED) {
                     "Invalid page store manager was created: " + cctx.pageStore();
 
                 Path anyIdxPartFile = IgniteUtils.searchFileRecursively(
-                    ((FilePageStoreManager)cctx.pageStore()).workDir().toPath(), FilePageStoreManager.INDEX_FILE_NAME);
+                    cctx.kernalContext().pdsFolderResolver().fileTree().nodeStorage().toPath(),
+                    FilePageStoreManager.INDEX_FILE_NAME
+                );
 
                 if (anyIdxPartFile != null) {
                     memCfg.setPageSize(resolvePageSizeFromPartitionFile(anyIdxPartFile));
@@ -1839,13 +1843,6 @@ private Map<Integer, Set<Integer>> partitionsApplicableForWalRebalance() {
         return lastCheckpointEntry == null ? null : lastCheckpointEntry.checkpointMark();
     }
 
-    /**
-     * @return Checkpoint directory.
-     */
-    public File checkpointDirectory() {
-        return checkpointManager.checkpointDirectory();
-    }
-
     /**
      * @param lsnr Listener.
      * @param dataRegion Data region for which listener is corresponded to.
@@ -1889,10 +1886,8 @@ private CheckpointStatus readCheckpointStatus() throws IgniteCheckedException {
         if (mntcTask != null) {
             log.warning("Maintenance task found, stop restoring memory");
 
-            File workDir = ((FilePageStoreManager)cctx.pageStore()).workDir();
-
             mntcRegistry.registerWorkflowCallback(CORRUPTED_DATA_FILES_MNTC_TASK_NAME,
-                new CorruptedPdsMaintenanceCallback(workDir,
+                new CorruptedPdsMaintenanceCallback(cctx.kernalContext().pdsFolderResolver().fileTree().nodeStorage(),
                     Arrays.asList(mntcTask.parameters().split(Pattern.quote(File.separator))))
             );
 

diff --git a/...org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointManager.java b/...org/apache/ignite/internal/processors/cache/persistence/checkpoint/CheckpointManager.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache.persistence.checkpoint;
 
-import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Collection;
@@ -38,6 +37,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.DataStorageMetricsImpl;
 import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
 import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryEx;
 import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImpl;
 import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
@@ -108,7 +108,7 @@ public class CheckpointManager {
      * @param cpFreqDeviation Distributed checkpoint frequency deviation.
      * @param checkpointMapSnapshotExecutor Checkpoint map snapshot executor.
      * @param marsh JDK marshaller.
-     * @throws IgniteCheckedException if fail.
+     * @param ft Node file tree.
      */
     public CheckpointManager(
         Function<Class<?>, IgniteLogger> logger,
@@ -129,8 +129,9 @@ public CheckpointManager(
         GridCacheProcessor cacheProcessor,
         Supplier<Integer> cpFreqDeviation,
         Executor checkpointMapSnapshotExecutor,
-        JdkMarshaller marsh
-    ) throws IgniteCheckedException {
+        JdkMarshaller marsh,
+        NodeFileTree ft
+    ) {
         CheckpointHistory cpHistory = new CheckpointHistory(
             persistenceCfg,
             logger,
@@ -147,7 +148,7 @@ public CheckpointManager(
             logger,
             cpHistory,
             ioFactory,
-            pageStoreManager.workDir().getAbsolutePath(),
+            ft,
             lock,
             checkpointMapSnapshotExecutor,
             marsh
@@ -259,13 +260,6 @@ public void memoryRecoveryRecordPtr(WALPointer memoryRecoveryRecordPtr) {
         checkpointWorkflow.memoryRecoveryRecordPtr(memoryRecoveryRecordPtr);
     }
 
-    /**
-     * @return Checkpoint directory.
-     */
-    public File checkpointDirectory() {
-        return checkpointMarkersStorage.cpDir;
-    }
-
     /**
      * @return Checkpoint storage.
      */