Merge pull request #4547 from halibobo1205/fix/lite_tool_merge

fix(lite):fix merge function.

Author: halibobo1205

framework/src/main/java/org/tron/core/db/Manager.java

@@ -489,6 +489,8 @@ public void init() {
 
     long headNum = chainBaseManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber();
     logger.info("current headNum is: {}", headNum);
+    int nodeType = chainBaseManager.getCommonStore().getNodeType();
+    logger.info("node type is: {}", Constant.NODE_TYPE_LIGHT_NODE == nodeType ? "lite" : "full");
     revokingStore.enable();
     validateSignService = Executors
         .newFixedThreadPool(Args.getInstance().getValidateSignThreadNum());

framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java

@@ -209,7 +209,7 @@ private void split(String sourceDir, String destDir, List<String> dbs) throws IO
     if (new File(destDir).exists()) {
       throw new RuntimeException("destDir is already exist, please remove it first");
     }
-    if (!destPath.mkdir()) {
+    if (!destPath.mkdirs()) {
       throw new RuntimeException("destDir create failed, please check");
     }
     Util.copyDatabases(Paths.get(sourceDir), Paths.get(destDir), dbs);
@@ -486,9 +486,15 @@ private static boolean isEmptyBytes(byte[] b) {
     return true;
   }
 
-  private void deleteSnapshotFlag(String databaseDir) throws IOException {
+  private void deleteSnapshotFlag(String databaseDir) throws IOException, RocksDBException {
     logger.info("-- delete the info file to identify this node is a real fullnode.");
     Files.delete(Paths.get(databaseDir, INFO_FILE_NAME));
+
+    DBInterface destCommonDb = DbTool.getDB(databaseDir, COMMON_DB_NAME);
+    destCommonDb.delete(DB_KEY_NODE_TYPE);
+    destCommonDb.delete(DB_KEY_LOWEST_BLOCK_NUM);
+    logger.info("-- deleted node_type and lowest_block_num  from  "
+        + "common to identify this node is a real fullnode.");
   }
 
   private void run(Args argv) {