core: reorg logs crashed, add a check for corner cases

JoeQian · Mar 3, 2017 · a38e1a9 · a38e1a9
1 parent faf7136
commit a38e1a9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -1145,13 +1145,16 @@ func (self *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
 		}
 	}
 	// Ensure the user sees large reorgs
-	logFn := log.Debug
-	if len(oldChain) > 63 {
-		logFn = log.Warn
+	if len(oldChain) > 0 && len(newChain) > 0 {
+		logFn := log.Debug
+		if len(oldChain) > 63 {
+			logFn = log.Warn
+		}
+		logFn("Chain split detected", "number", commonBlock.Number(), "hash", commonBlock.Hash(),
+			"drop", len(oldChain), "dropfrom", oldChain[0].Hash(), "add", len(newChain), "addfrom", newChain[0].Hash())
+	} else {
+		log.Error("Impossible reorg, please file an issue", "oldnum", oldBlock.Number(), "oldhash", oldBlock.Hash(), "newnum", newBlock.Number(), "newhash", newBlock.Hash())
 	}
-	logFn("Chain split detected", "number", commonBlock.Number(), "hash", commonBlock.Hash(),
-		"drop", len(oldChain), "dropfrom", oldChain[0].Hash(), "add", len(newChain), "addfrom", newChain[0].Hash())
-
 	var addedTxs types.Transactions
 	// insert blocks. Order does not matter. Last block will be written in ImportChain itself which creates the new head properly
 	for _, block := range newChain {