This is an automated email from the ASF dual-hosted git repository. marklau99 pushed a commit to branch IOTDB-4337 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa66448d64aade76a059f20f3b6c55d3af4e22f6 Author: LiuXuxin <[email protected]> AuthorDate: Mon Sep 5 19:28:05 2022 +0800 delete origin data before loading snapshot without log --- .../java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java index cff5886f38..e3fdf3750a 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java @@ -114,6 +114,13 @@ public class SnapshotLoader { private DataRegion loadSnapshotWithoutLog() { try { + try { + deleteAllFilesInDataDirs(); + LOGGER.info("Remove all data files in original data dir"); + } catch (IOException e) { + LOGGER.error("Failed to remove origin data files", e); + return null; + } LOGGER.info("Moving snapshot file to data dirs"); createLinksFromSnapshotDirToDataDirWithoutLog(new File(snapshotPath)); return loadSnapshot(); @@ -137,6 +144,7 @@ public class SnapshotLoader { deleteAllFilesInDataDirs(); LOGGER.info("Remove all data files in original data dir"); } catch (IOException e) { + LOGGER.error("Failed to remove origin data files", e); return null; }
