Merge pull request #5224 from guoquanwu/fix/checkpointv2-atomic-del

fix(db): skip expired checkpoints for recovery

Author: tomatoishealthy

chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java

@@ -471,9 +471,10 @@ private void pruneCheckpoint() {
     if (cpList.size() < 3) {
       return;
     }
+    long latestTimestamp = Long.parseLong(cpList.get(cpList.size()-1));
     for (String cp: cpList.subList(0, cpList.size()-3)) {
       long timestamp = Long.parseLong(cp);
-      if (System.currentTimeMillis() - timestamp < ONE_MINUTE_MILLS*2) {
+      if (latestTimestamp - timestamp <= ONE_MINUTE_MILLS*2) {
         break;
       }
       String checkpointPath = Paths.get(StorageUtils.getOutputDirectoryByDbName(CHECKPOINT_V2_DIR),
@@ -522,7 +523,12 @@ private void checkV2() {
       return;
     }
 
+    long latestTimestamp = Long.parseLong(cpList.get(cpList.size()-1));
     for (String cp: cpList) {
+      long timestamp = Long.parseLong(cp);
+      if (latestTimestamp - timestamp > ONE_MINUTE_MILLS*2) {
+        continue;
+      }
       TronDatabase<byte[]> checkPointV2Store = getCheckpointDB(cp);
       recover(checkPointV2Store);
       checkPointV2Store.close();