Skip to content

Commit

Permalink
debug log
Browse files Browse the repository at this point in the history
  • Loading branch information
cc14514 committed Nov 26, 2018
1 parent 8cd9ee3 commit 04cce0b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
1 change: 1 addition & 0 deletions core/blockchain.go
Expand Up @@ -879,6 +879,7 @@ func (bc *BlockChain) WriteBlockAndState(block *types.Block, receipts []*types.R
// After insertion is done, all accumulated events will be fired.
func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
n, events, logs, err := bc.insertChain(chain)
log.Debug("Inserted block end","number",chain[0].Number())
bc.PostChainEvents(events, logs)
return n, err
}
Expand Down
9 changes: 5 additions & 4 deletions eth/fetcher/fetcher.go
Expand Up @@ -642,7 +642,7 @@ func (f *Fetcher) insert(peer string, block *types.Block) {
log.Debug("Importing propagated block", "peer", peer, "number", block.Number(), "hash", hash)
go func() {
defer func() {
log.Debug("insert_done","number",block.Number())
log.Debug("insert_done", "number", block.Number())
f.done <- hash
}()

Expand All @@ -669,12 +669,13 @@ func (f *Fetcher) insert(peer string, block *types.Block) {
return
}
// Run the actual import and log any issues
log.Debug("insert_begin","number",block.Number())
if _, err := f.insertChain(types.Blocks{block}); err != nil {
log.Debug("insert_begin", "number", block.Number())
_, err := f.insertChain(types.Blocks{block})
log.Debug("insert_end", "number", block.Number(), "err", err)
if err != nil {
log.Debug("Propagated block import failed", "peer", peer, "number", block.Number(), "hash", hash, "err", err)
return
}
log.Debug("insert_end","number",block.Number())
// If import succeeded, broadcast the block
propAnnounceOutTimer.UpdateSince(block.ReceivedAt)
go f.broadcastBlock(block, false)
Expand Down
6 changes: 4 additions & 2 deletions eth/handler.go
Expand Up @@ -171,14 +171,16 @@ func NewProtocolManager(config *params.ChainConfig, mode downloader.SyncMode, ne
heighter := func() uint64 {
return blockchain.CurrentBlock().NumberU64()
}
inserter := func(blocks types.Blocks) (int, error) {
inserter := func(blocks types.Blocks) (i int, e error) {
// If fast sync is running, deny importing weird blocks
if atomic.LoadUint32(&manager.fastSync) == 1 {
log.Warn("Discarded bad propagated block", "number", blocks[0].Number(), "hash", blocks[0].Hash())
return 0, nil
}
atomic.StoreUint32(&manager.acceptTxs, 1) // Mark initial sync done on any fetcher import
return manager.blockchain.InsertChain(blocks)
i, e = manager.blockchain.InsertChain(blocks)
log.Debug("Inserted block done","number",blocks[0].Number())
return
}
manager.fetcher = fetcher.New(blockchain.GetBlockByHash, validator, manager.BroadcastBlock, heighter, inserter, manager.removePeer)

Expand Down

0 comments on commit 04cce0b

Please sign in to comment.