Skip to content

[to dev/1.3] Add copy fallback for compaction hard links #18083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 6 commits into from
Jul 1, 2026
Merged

[to dev/1.3] Add copy fallback for compaction hard links #18083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e09546e
Add copy fallback for compaction hard links
shuwenwei Jun 26, 2026
0c6aa7c
Simplify create link fallback handling
shuwenwei Jun 26, 2026
8ac47dc
Replace remaining compaction hard links with FileUtils
shuwenwei Jul 1, 2026
27bf0c0
Keep compaction recovery tests using direct hard links
shuwenwei Jul 1, 2026
5b4b89a
spotless
shuwenwei Jul 1, 2026
324345f
fix compilation error
shuwenwei Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...e/dataregion/compaction/execute/performer/impl/RepairUnsortedFileCompactionPerformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl;

import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionUtils;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.writer.AbstractCompactionWriter;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.writer.RepairUnsortedFileCompactionWriter;
Expand All @@ -31,7 +32,6 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -74,17 +74,18 @@ protected QueryDataSource initQueryDataSource() {
private void prepareTargetFile() throws IOException {
TsFileResource seqSourceFile = seqFiles.get(0);
TsFileResource targetFile = targetFiles.get(0);
Files.createLink(targetFile.getTsFile().toPath(), seqSourceFile.getTsFile().toPath());
FileUtils.createLink(targetFile.getTsFile().toPath(), seqSourceFile.getTsFile().toPath(), true);
ITimeIndex timeIndex = seqSourceFile.getTimeIndex();
if (timeIndex instanceof DeviceTimeIndex) {
targetFile.setTimeIndex(timeIndex);
} else {
targetFile.setTimeIndex(CompactionUtils.buildDeviceTimeIndex(seqSourceFile));
}
if (seqSourceFile.modFileExists()) {
Files.createLink(
FileUtils.createLink(
new File(seqSourceFile.getCompactionModFile().getFilePath()).toPath(),
new File(seqSourceFile.getModFile().getFilePath()).toPath());
new File(seqSourceFile.getModFile().getFilePath()).toPath(),
true);
}
}

Expand Down
13 changes: 8 additions & 5 deletions ...e/iotdb/db/storageengine/dataregion/compaction/execute/task/InnerSpaceCompactionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task;

import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
Expand Down Expand Up @@ -443,14 +444,16 @@ protected void prepareTargetFiles() throws IOException {
for (int i = 0; i < filesView.renamedTargetFiles.size(); i++) {
TsFileResource oldFile = filesView.skippedSourceFiles.get(i);
TsFileResource newFile = filesView.renamedTargetFiles.get(i);
Files.createLink(newFile.getTsFile().toPath(), oldFile.getTsFile().toPath());
Files.createLink(
FileUtils.createLink(newFile.getTsFile().toPath(), oldFile.getTsFile().toPath(), true);
FileUtils.createLink(
new File(newFile.getTsFilePath() + TsFileResource.RESOURCE_SUFFIX).toPath(),
new File(oldFile.getTsFilePath() + TsFileResource.RESOURCE_SUFFIX).toPath());
new File(oldFile.getTsFilePath() + TsFileResource.RESOURCE_SUFFIX).toPath(),
true);
if (oldFile.modFileExists()) {
Files.createLink(
FileUtils.createLink(
new File(newFile.getTsFilePath() + ModificationFile.FILE_SUFFIX).toPath(),
new File(oldFile.getTsFilePath() + ModificationFile.FILE_SUFFIX).toPath());
new File(oldFile.getTsFilePath() + ModificationFile.FILE_SUFFIX).toPath(),
true);
}
newFile.deserialize();
}
Expand Down
13 changes: 8 additions & 5 deletions ...b/storageengine/dataregion/compaction/execute/task/InsertionCrossSpaceCompactionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task;

import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.service.metrics.FileMetrics;
import org.apache.iotdb.db.storageengine.dataregion.compaction.constant.CompactionTaskType;
Expand Down Expand Up @@ -218,14 +219,16 @@ public File generateTargetFile() throws IOException {
private void prepareTargetFiles() throws IOException {
File sourceTsFile = unseqFileToInsert.getTsFile();
File targetTsFile = targetFile.getTsFile();
Files.createLink(targetTsFile.toPath(), sourceTsFile.toPath());
Files.createLink(
FileUtils.createLink(targetTsFile.toPath(), sourceTsFile.toPath(), true);
FileUtils.createLink(
new File(targetTsFile.getPath() + TsFileResource.RESOURCE_SUFFIX).toPath(),
new File(sourceTsFile.getPath() + TsFileResource.RESOURCE_SUFFIX).toPath());
new File(sourceTsFile.getPath() + TsFileResource.RESOURCE_SUFFIX).toPath(),
true);
if (unseqFileToInsert.getModFile().exists()) {
Files.createLink(
FileUtils.createLink(
new File(targetTsFile.getPath() + ModificationFile.FILE_SUFFIX).toPath(),
new File(sourceTsFile.getPath() + ModificationFile.FILE_SUFFIX).toPath());
new File(sourceTsFile.getPath() + ModificationFile.FILE_SUFFIX).toPath(),
true);
}
targetFile.setProgressIndex(unseqFileToInsert.getMaxProgressIndex());
targetFile.deserialize();
Expand Down
7 changes: 4 additions & 3 deletions ...db/storageengine/dataregion/compaction/execute/task/RepairUnsortedFileCompactionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.task;

import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.storageengine.dataregion.compaction.constant.CompactionTaskType;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.impl.RepairUnsortedFileCompactionPerformer;
import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionUtils;
Expand All @@ -35,7 +36,6 @@

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.CountDownLatch;
Expand Down Expand Up @@ -169,9 +169,10 @@ protected void prepareTargetFiles() throws IOException {
filesView.sourceFilesInCompactionPerformer, filesView.targetFilesInPerformer);
} else {
if (sourceFile.modFileExists()) {
Files.createLink(
FileUtils.createLink(
new File(filesView.targetFilesInPerformer.get(0).getModFile().getFilePath()).toPath(),
new File(sourceFile.getModFile().getFilePath()).toPath());
new File(sourceFile.getModFile().getFilePath()).toPath(),
true);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/org/apache/iotdb/db/storageengine/dataregion/modification/ModificationFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.iotdb.db.storageengine.dataregion.modification;

import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.storageengine.dataregion.modification.io.LocalTextModificationAccessor;
import org.apache.iotdb.db.storageengine.dataregion.modification.io.ModificationReader;
import org.apache.iotdb.db.storageengine.dataregion.modification.io.ModificationWriter;
Expand Down Expand Up @@ -180,7 +181,7 @@ public ModificationFile createHardlink() {
File hardlink = new File(filePath + hardlinkSuffix);

try {
Files.createLink(Paths.get(hardlink.getAbsolutePath()), Paths.get(filePath));
FileUtils.createLink(Paths.get(hardlink.getAbsolutePath()), Paths.get(filePath), true);
return new ModificationFile(hardlink.getAbsolutePath());
} catch (FileAlreadyExistsException e) {
// retry a different name if the file is already created
Expand Down
17 changes: 17 additions & 0 deletions iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,23 @@ public static boolean deleteFileIfExist(File file) {
}
}

public static void createLink(Path link, Path existing, boolean fallBackToCopy)
throws IOException {
try {
Files.createLink(link, existing);
} catch (IOException | UnsupportedOperationException e) {
if (!fallBackToCopy) {
throw e;
}
try {
Files.copy(existing, link);
} catch (IOException copyException) {
copyException.addSuppressed(e);
throw copyException;
}
}
}

public static void deleteFileOrDirectory(File file) {
deleteFileOrDirectory(file, false);
}
Expand Down
Loading