This is an automated email from the ASF dual-hosted git repository.
jt2594838 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 08cebbd76c1 Fix snapshots of deleted TsFile resources during DataNode
removal (#19192)
08cebbd76c1 is described below
commit 08cebbd76c19c9b7df11a7ef1ac14ae5fc13c085
Author: Hongzhi Gao <[email protected]>
AuthorDate: Tue Nov 10 11:06:24 2026 +0800
Fix snapshots of deleted TsFile resources during DataNode removal (#19192)
* Fix snapshots of deleted TsFile resources
* Simplify snapshot regression coverage
---
.../iotdb/db/i18n/StorageEngineMessages.java | 2 +-
.../iotdb/db/i18n/StorageEngineMessages.java | 2 +-
.../dataregion/snapshot/SnapshotTaker.java | 13 +++++++-
.../dataregion/tsfile/TsFileResource.java | 4 +++
.../storageengine/dataregion/DataRegionTest.java | 39 ++++++++++++++++++++++
.../dataregion/snapshot/IoTDBSnapshotTest.java | 30 +++++++++++++++++
.../dataregion/tsfile/TsFileResourceTest.java | 5 +++
7 files changed, 92 insertions(+), 3 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/StorageEngineMessages.java
b/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/StorageEngineMessages.java
index 7133bf09abd..9aa37d450a8 100644
---
a/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/StorageEngineMessages.java
+++
b/iotdb-core/datanode/src/main/i18n/en/org/apache/iotdb/db/i18n/StorageEngineMessages.java
@@ -635,7 +635,7 @@ public final class StorageEngineMessages {
public static final String CANNOT_SNAPSHOT_UNCLOSED_TSFILE =
"Cannot create snapshot because TsFile {} is not closed";
public static final String HARD_LINK_TARGET_DIR_NOT_EXIST = "Hard link
target dir {} doesn't exist";
- public static final String HARD_LINK_SOURCE_FILE_NOT_EXIST = "Hard link
source file {} doesn't exist, this file will be ignored.";
+ public static final String HARD_LINK_SOURCE_FILE_NOT_EXIST = "Hard link
source file {} doesn't exist.";
public static final String COPY_TARGET_DIR_NOT_EXIST = "Copy target dir {}
doesn't exist";
public static final String COPY_SOURCE_FILE_NOT_EXIST = "Copy source file {}
doesn't exist";
public static final String CANNOT_CREATE_DIRECTORY = "Cannot create
directory ";
diff --git
a/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/StorageEngineMessages.java
b/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/StorageEngineMessages.java
index 1603065835b..784ee7287e4 100644
---
a/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/StorageEngineMessages.java
+++
b/iotdb-core/datanode/src/main/i18n/zh/org/apache/iotdb/db/i18n/StorageEngineMessages.java
@@ -616,7 +616,7 @@ public final class StorageEngineMessages {
public static final String CANNOT_SNAPSHOT_UNCLOSED_TSFILE =
"无法创建快照,因为 TsFile {} 尚未关闭";
public static final String HARD_LINK_TARGET_DIR_NOT_EXIST = "硬链接目标目录 {} 不存在";
- public static final String HARD_LINK_SOURCE_FILE_NOT_EXIST = "硬链接源文件 {}
不存在,该文件将被忽略。";
+ public static final String HARD_LINK_SOURCE_FILE_NOT_EXIST = "硬链接源文件 {}
不存在。";
public static final String COPY_TARGET_DIR_NOT_EXIST = "复制目标目录 {} 不存在";
public static final String COPY_SOURCE_FILE_NOT_EXIST = "复制源文件 {} 不存在";
public static final String CANNOT_CREATE_DIRECTORY = "无法创建目录: ";
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/SnapshotTaker.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/SnapshotTaker.java
index 854909bc14c..d32615fec33 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/SnapshotTaker.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/SnapshotTaker.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Arrays;
@@ -226,6 +227,16 @@ public class SnapshotTaker {
private boolean createSnapshot(List<TsFileResource> resources, String
snapshotId) {
try {
+ // Closing empty files can delete resources after readLockTheFile()
captured them.
+ // Remove them from subsequent snapshot processing and balance their
captured read locks.
+ resources.removeIf(
+ resource -> {
+ if (resource.isDeleted()) {
+ resource.readUnlock();
+ return true;
+ }
+ return false;
+ });
for (TsFileResource resource : resources) {
if (!resource.isClosed()) {
LOGGER.error(StorageEngineMessages.CANNOT_SNAPSHOT_UNCLOSED_TSFILE,
resource);
@@ -279,7 +290,7 @@ public class SnapshotTaker {
LOGGER.error(StorageEngineMessages.HARD_LINK_TARGET_DIR_NOT_EXIST,
target.getParentFile());
}
if (!checkHardLinkSourceFile(source, 10)) {
- return;
+ throw new FileNotFoundException(source.getAbsolutePath());
}
Files.deleteIfExists(target.toPath());
SnapshotFileUtils.createLinkOrCopy(target.toPath(), source.toPath());
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java
index a431665aa17..5629173986a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java
@@ -70,6 +70,7 @@ import org.slf4j.LoggerFactory;
import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -332,6 +333,9 @@ public class TsFileResource implements PersistentResource,
Cloneable {
/** deserialize from disk */
public void deserialize() throws IOException {
try (InputStream inputStream = fsFactory.getBufferedInputStream(file +
RESOURCE_SUFFIX)) {
+ if (inputStream == null) {
+ throw new FileNotFoundException(file + RESOURCE_SUFFIX);
+ }
// The first byte is VERSION_NUMBER, second byte is timeIndexType.
ReadWriteIOUtils.readByte(inputStream);
timeIndex =
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
index 250ccc18dad..e131ae6e468 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java
@@ -33,6 +33,7 @@ import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.NonAlignedFullPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId;
+import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -83,6 +84,8 @@ import
org.apache.iotdb.db.storageengine.dataregion.modification.TreeDeletionEnt
import org.apache.iotdb.db.storageengine.dataregion.modification.v1.Deletion;
import
org.apache.iotdb.db.storageengine.dataregion.modification.v1.ModificationFileV1;
import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource;
+import org.apache.iotdb.db.storageengine.dataregion.snapshot.SnapshotLoader;
+import org.apache.iotdb.db.storageengine.dataregion.snapshot.SnapshotTaker;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import
org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
import
org.apache.iotdb.db.storageengine.dataregion.tsfile.generator.TsFileNameGenerator;
@@ -614,6 +617,42 @@ public class DataRegionTest {
field.set(SystemInfo.getInstance(), value);
}
+ @Test
+ public void testSnapshotAfterDeletingUnflushedData() throws Exception {
+ dataRegion.setAllowCompaction(false);
+ TSRecord record = new TSRecord(deviceId, 1);
+ record.addTuple(DataPoint.getDataPoint(TSDataType.INT32, measurementId,
"10"));
+ dataRegion.insert(buildInsertRowNodeByTSRecord(record));
+ TsFileResource resource =
dataRegion.getTsFileManager().getTsFileList(true).get(0);
+ Assert.assertFalse(resource.isClosed());
+ MeasurementPath path = new MeasurementPath(deviceId, measurementId);
+ dataRegion.deleteByDevice(
+ path,
+ new DeleteDataNode(
+ new PlanNodeId("delete"),
+ Collections.singletonList(path),
+ Long.MIN_VALUE,
+ Long.MAX_VALUE));
+
+ File snapshotDir = new File(TestConstant.OUTPUT_DATA_DIR,
"snapshot-deleted-unflushed");
+ try {
+ Assert.assertTrue(
+ new
SnapshotTaker(dataRegion).takeFullSnapshot(snapshotDir.getAbsolutePath(),
true));
+ Assert.assertTrue(resource.isDeleted());
+ Assert.assertFalse(resource.tsFileExists());
+ Assert.assertTrue(resource.tryWriteLock());
+ resource.writeUnlock();
+ DataRegion loaded =
+ new SnapshotLoader(snapshotDir.getAbsolutePath(), storageGroup, "0")
+ .loadSnapshotForStateMachine();
+ Assert.assertNotNull(loaded);
+
Assert.assertTrue(loaded.getTsFileManager().getTsFileList(true).isEmpty());
+
Assert.assertTrue(loaded.getTsFileManager().getTsFileList(false).isEmpty());
+ } finally {
+ FileUtils.recursivelyDeleteFolder(snapshotDir.getAbsolutePath());
+ }
+ }
+
@Test
public void testUnseqUnsealedDelete()
throws WriteProcessException, IOException, MetadataException {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/IoTDBSnapshotTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/IoTDBSnapshotTest.java
index 84d8deac3d7..4f70a3f1319 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/IoTDBSnapshotTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/snapshot/IoTDBSnapshotTest.java
@@ -148,6 +148,36 @@ public class IoTDBSnapshotTest {
}
}
+ @Test
+ public void testRejectSnapshotWithMissingResource() throws Exception {
+ String[][] originDataDirs =
IoTDBDescriptor.getInstance().getConfig().getTierDataDirs();
+ IoTDBDescriptor.getInstance().getConfig().setTierDataDirs(testDataDirs);
+ TierManager.getInstance().resetFolders();
+ File snapshotDir = new File("target/snapshot-missing-resource");
+ try {
+ List<TsFileResource> resources = writeTsFiles(testDataDirs[0]);
+ TsFileResource resource = resources.get(0);
+ Files.delete(new File(resource.getTsFilePath() +
TsFileResource.RESOURCE_SUFFIX).toPath());
+ DataRegion region = new DataRegion(testSgName, "0");
+ region.getTsFileManager().add(resource, true);
+ Assert.assertFalse(
+ new
SnapshotTaker(region).takeFullSnapshot(snapshotDir.getAbsolutePath(), true));
+ SnapshotLogAnalyzer analyzer =
+ new SnapshotLogAnalyzer(new File(snapshotDir,
SnapshotLogger.SNAPSHOT_LOG_NAME));
+ try {
+ Assert.assertFalse(analyzer.isSnapshotComplete());
+ } finally {
+ analyzer.close();
+ }
+ Assert.assertTrue(resource.tryWriteLock());
+ resource.writeUnlock();
+ } finally {
+ FileUtils.recursivelyDeleteFolder(snapshotDir.getAbsolutePath());
+
IoTDBDescriptor.getInstance().getConfig().setTierDataDirs(originDataDirs);
+ TierManager.getInstance().resetFolders();
+ }
+ }
+
@Test
public void testRejectSnapshotWithUnclosedTsFile()
throws IOException, WriteProcessException, DirectoryNotLegalException {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResourceTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResourceTest.java
index 453e934b5b0..f0149f799c1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResourceTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResourceTest.java
@@ -99,6 +99,11 @@ public class TsFileResourceTest {
}
}
+ @Test(expected = IOException.class)
+ public void testDeserializeMissingResource() throws IOException {
+ tsFileResource.deserialize();
+ }
+
@Test
public void testSerializeAndDeserialize() throws IOException {
tsFileResource.serialize();