there is not the most recent common ancestor, need to remove all blocks in the fork chain

Author: Yrp

src/main/java/org/tron/core/db/KhaosDatabase.java

@@ -350,6 +350,7 @@ public BlockCapsule getParentBlock(Sha256Hash hash) {
         .map(KhaosBlock::getParent)
         .map(khaosBlock -> khaosBlock == null ? null : khaosBlock.blk)
         .filter(Objects::nonNull)
+        .filter(b -> containBlock(b.getBlockId()))
         .findFirst()
         .orElse(null);
   }

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

@@ -594,9 +594,8 @@ private void switchFork(BlockCapsule newHead)
       logger.info("there is not the most recent common ancestor, need to remove all blocks in the fork chain.");
       BlockCapsule tmp = newHead;
       while (tmp != null) {
-        BlockCapsule parent = khaosDb.getParentBlock(tmp.getBlockId());
         khaosDb.removeBlk(tmp.getBlockId());
-        tmp = parent;
+        tmp = khaosDb.getBlock(tmp.getParentHash());
       }
 
       throw e;