Redo-import now prints every imported block and the final execution time

aionnetwork · Jul 26, 2019 · 6dfb187 · 6dfb187
1 parent 27e821d
commit 6dfb187
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modAionImpl/src/org/aion/zero/impl/db/DBUtils.java b/modAionImpl/src/org/aion/zero/impl/db/DBUtils.java
@@ -534,7 +534,6 @@ public static void redoMainChainImport(long startHeight) {
         CfgAion cfg = CfgAion.inst();
         cfg.dbFromXML();
         cfg.getConsensus().setMining(false);
-        cfg.getDb().setHeapCacheEnabled(true);
 
         System.out.println("\nImporting stored blocks INITIATED...\n");
 
@@ -617,9 +616,14 @@ public static void redoMainChainImport(long startHeight) {
                     try {
                         // clear the index entry and prune side-chain blocks
                         store.redoIndexWithoutSideChains(block);
+                        long t1 = System.currentTimeMillis();
                         result =
                                 chain.tryToConnectAndFetchSummary(
                                         block, System.currentTimeMillis() / THOUSAND_MS, false);
+                        long t2 = System.currentTimeMillis();
+                        System.out.println("<import-status: hash = " + block.getShortHash() + ", number = " + block.getNumber()
+                                               + ", txs = " + block.getTransactionsList().size() + ", result = " + result.getLeft()
+                                               + ", time elapsed = " + (t2 - t1) + " ms, td = " + chain.getTotalDifficulty() + ">");
                     } catch (Throwable t) {
                         // we want to see the exception and the block where it occurred
                         t.printStackTrace();
@@ -692,6 +696,7 @@ public AionBlockSummary getRight() {
 
                     currentBlock++;
                 }
+                System.out.println("Import from " + startHeight + " to " + topBlockNumber + " completed in " + (System.currentTimeMillis() - start) + " ms time.");
             }
 
             if (fail) {