diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-03 20:37:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 20:37:02 +0800 |
| commit | 1a00e39539f2bd7f59430062faa42bbc28cb89d2 (patch) | |
| tree | 4e6bbac5a4125cf9b4807222cb290718f514dda2 | |
| parent | 92e50adfa35d77a3bb286830cf161ede916b1272 (diff) | |
| parent | a38e1a9c00c6a0b95408269a035b409b8ff6c228 (diff) | |
| download | dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar.gz dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar.bz2 dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar.lz dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar.xz dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.tar.zst dexon-1a00e39539f2bd7f59430062faa42bbc28cb89d2.zip | |
Merge pull request #3738 from karalabe/impossible-reorg-warning
core: reorg logs crashed, add a check for corner cases
| -rw-r--r-- | core/blockchain.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 88ba76bc7..3879f0644 100644 --- 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 { |