fix(db): fix leveldb manifest rewrite.

1. do not generate engine.properties if it is not a db path
tronprotocol · Sep 19, 2022 · 13eb9a3 · 13eb9a3
1 parent e09095c
commit 13eb9a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugins/src/main/java/org/tron/plugins/ArchiveManifest.java b/plugins/src/main/java/org/tron/plugins/ArchiveManifest.java
@@ -197,14 +197,14 @@ public boolean doArchive() throws IOException {
       logger.info("File {},does not exist, ignored.", srcDbPath.toString());
       return true;
     }
-    if (!checkEngine()) {
-      logger.info("Db {},not leveldb, ignored.", this.name);
-      return true;
-    }
     if (!checkManifest(levelDbFile.toString())) {
       logger.info("Db {},no need, ignored.", levelDbFile.toString());
       return true;
     }
+    if (!checkEngine()) {
+      logger.info("Db {},not leveldb, ignored.", this.name);
+      return true;
+    }
     open();
     logger.info("Db {} archive use {} ms.", this.name, (System.currentTimeMillis() - startTime));
     return true;

diff --git a/plugins/src/main/java/org/tron/plugins/DbArchive.java b/plugins/src/main/java/org/tron/plugins/DbArchive.java
@@ -187,12 +187,12 @@ public void doArchive() {
         logger.info("File {},does not exist, ignored.", srcDbPath);
         return;
       }
-      if (!checkEngine()) {
-        logger.info("Db {},not leveldb, ignored.", this.name);
-        return;
-      }
       try {
         if (checkManifest(levelDbFile.toString())) {
+          if (!checkEngine()) {
+            logger.info("Db {},not leveldb, ignored.", this.name);
+            return;
+          }
           open();
           logger.info("Db {} archive use {} ms.", this.name,
               (System.currentTimeMillis() - startTime));