Fixed the kernel shutdown hanging

aionnetwork · Mar 17, 2020 · 08e4c58 · 08e4c58
1 parent 5fb5e03
commit 08e4c58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/modAionImpl/src/org/aion/zero/impl/blockchain/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/blockchain/AionBlockchainImpl.java
@@ -907,15 +907,15 @@ public Pair<ByteArrayWrapper, Long> findMissingAncestor(Block block) {
     public static boolean reachedFullSync = false;
 
     public ImportResult tryToConnect(final Block block) {
+        checkKernelShutdownForCLI();
         return tryToConnect(new BlockWrapper(block));
     }
 
     public synchronized ImportResult tryToConnect(final BlockWrapper blockWrapper) {
-        checkKernelShutdownForCLI();
         return tryToConnectWithTimedExecution(blockWrapper).getLeft();
     }
 
-    private void checkKernelShutdownForCLI() {
+    public void checkKernelShutdownForCLI() {
         if (bestBlock.getNumber() == shutdownHook) {
             LOG.info("Shutting down and dumping heap as indicated by CLI request since block number {} was reached.", shutdownHook);
 
@@ -949,8 +949,6 @@ public synchronized Triple<Long, Set<ByteArrayWrapper>, ImportResult> tryToConne
         ImportResult importResult = null;
         Set<ByteArrayWrapper> imported = new HashSet<>();
         for (Block block : blockRange) {
-            checkKernelShutdownForCLI();
-
             Pair<ImportResult, Long> result = tryToConnectWithTimedExecution(new BlockWrapper(block));
             importResult = result.getLeft();
             long importTime = result.getRight();
@@ -974,6 +972,10 @@ public synchronized Triple<Long, Set<ByteArrayWrapper>, ImportResult> tryToConne
             } else {
                 imported.add(block.getHashWrapper());
             }
+
+            if (bestBlock.getNumber() == shutdownHook || (enableFullSyncCheck && reachedFullSync)) {
+                break;
+            }
         }
         return Triple.of(bestBlock.getNumber(), imported, importResult);
     }

diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
@@ -229,6 +229,8 @@ private SyncMode processBatch(SyncMode syncMode, List<Block> batch, String displ
                 syncStats.updatePeerBlocks(displayId, count, BlockType.IMPORTED);
                 log.info("<import-status: node = {}, from = #{}, to = #{}, time elapsed = {} ms>", displayId, first, currentBest, importDuration);
             }
+
+            chain.checkKernelShutdownForCLI();
         } catch (Exception e) {
             log.error("<import-block throw> ", e);