This is an automated email from the ASF dual-hosted git repository.
CRZbulabula 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 b8765eda64f Fix ConfigNode procedure snapshot loading with MD5 files
(#19101)
b8765eda64f is described below
commit b8765eda64fc061a3b9f1481c9a01304ea19bc60
Author: d-wang-commit <[email protected]>
AuthorDate: Tue Nov 3 15:24:11 2026 +0800
Fix ConfigNode procedure snapshot loading with MD5 files (#19101)
Load only regular procedure .bin files and preserve checksum sidecars.
Cover snapshots with and without procedures using real MD5 files.
---
.../confignode/persistence/ProcedureInfo.java | 4 ++-
.../confignode/persistence/ProcedureInfoTest.java | 38 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
index 7409258b8c9..148a7fdd09a 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
@@ -268,7 +268,9 @@ public class ProcedureInfo implements SnapshotProcessor {
Arrays.stream(Objects.requireNonNull(procedureSnapshotDir.listFiles()))
.forEach(
procedureSnapshotFile -> {
- if
(!procedureSnapshotFile.getName().equals(MAIN_SNAPSHOT_FILENAME)) {
+ if (procedureSnapshotFile.isFile()
+ &&
procedureSnapshotFile.getName().endsWith(PROCEDURE_SNAPSHOT_FILE_SUFFIX)
+ &&
!procedureSnapshotFile.getName().equals(MAIN_SNAPSHOT_FILENAME)) {
loadProcedure(procedureSnapshotFile.toPath())
.ifPresent(procedure ->
procedureMap.put(procedure.getProcId(), procedure));
}
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ProcedureInfoTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ProcedureInfoTest.java
index 73c94e5247f..f51992324f0 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ProcedureInfoTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/ProcedureInfoTest.java
@@ -23,10 +23,13 @@ import org.apache.iotdb.commons.utils.FileUtils;
import
org.apache.iotdb.confignode.consensus.request.write.procedure.UpdateProcedurePlan;
import
org.apache.iotdb.confignode.procedure.impl.testonly.NeverFinishProcedure;
+import org.apache.ratis.util.MD5FileUtil;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import java.io.File;
import java.util.stream.LongStream;
@@ -37,6 +40,8 @@ public class ProcedureInfoTest {
private static final ProcedureInfo procedureInfo = new ProcedureInfo(null);
private static final File snapshotDir = new File(BASE_OUTPUT_PATH,
"snapshot");
+ @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+
@BeforeClass
public static void setup() {
if (!snapshotDir.exists()) {
@@ -72,4 +77,37 @@ public class ProcedureInfoTest {
procedureInfo1.processLoadSnapshot(snapshotDir);
Assert.assertEquals(procedureInfo, procedureInfo1);
}
+
+ @Test
+ public void testSnapshotWithMd5Files() throws Exception {
+ ProcedureInfo expected = new ProcedureInfo(null);
+ expected.updateProcedure(new UpdateProcedurePlan(new
NeverFinishProcedure(1)));
+ expected.updateProcedure(new UpdateProcedurePlan(new
NeverFinishProcedure(100)));
+ assertSnapshotWithMd5Files(expected);
+ }
+
+ @Test
+ public void testEmptySnapshotWithMd5File() throws Exception {
+ assertSnapshotWithMd5Files(new ProcedureInfo(null));
+ }
+
+ private void assertSnapshotWithMd5Files(ProcedureInfo expected) throws
Exception {
+ File snapshotWithMd5 = temporaryFolder.newFolder();
+ Assert.assertTrue(expected.processTakeSnapshot(snapshotWithMd5));
+ File[] snapshotFiles = new File(snapshotWithMd5, "procedures").listFiles();
+ Assert.assertNotNull(snapshotFiles);
+ Assert.assertEquals(expected.getProcedures().size() + 1,
snapshotFiles.length);
+ for (File snapshotFile : snapshotFiles) {
+ MD5FileUtil.computeAndSaveMd5ForFile(snapshotFile);
+ }
+
+ ProcedureInfo actual = new ProcedureInfo(null);
+ actual.processLoadSnapshot(snapshotWithMd5);
+ Assert.assertEquals(expected, actual);
+
+ for (File snapshotFile : snapshotFiles) {
+
Assert.assertTrue(MD5FileUtil.getDigestFileForFile(snapshotFile).isFile());
+ MD5FileUtil.verifySavedMD5(snapshotFile,
MD5FileUtil.computeMd5ForFile(snapshotFile));
+ }
+ }
}