[iotdb] branch master updated: delete origin data before loading snapshot without log (#7236)

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin 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 d81192ddca delete origin data before loading snapshot without log 
(#7236)
d81192ddca is described below

commit d81192ddca4f37ab1f48154b2c686a2022491fa9
Author: Liu Xuxin <37140360+thumark...@users.noreply.github.com>
AuthorDate: Tue Sep 6 09:25:59 2022 +0800

    delete origin data before loading snapshot without log (#7236)
---
 .../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;
       }