cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

eth/downloader: don't penalize for stale cross checks

Browse Source
This commit is contained in:
Péter Szilágyi 2015-05-15 13:32:21 +03:00
parent 83226762c2
commit b517967f86
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eth/downloader/downloader.go
View File

@ -64,8 +64,9 @@ type Downloader struct {
mux *event.TypeMux mux *event.TypeMux
mu sync.RWMutex mu sync.RWMutex
queue *queue queue *queue // Scheduler for selecting the hashes to download
peers *peerSet peers *peerSet // Set of active peers from which download can proceed
checks map[common.Hash]time.Time // Pending cross checks to verify a hash chain
// Callbacks // Callbacks
hasBlock hashCheckFn hasBlock hashCheckFn
@ -89,6 +90,7 @@ func New(mux *event.TypeMux, hasBlock hashCheckFn, getBlock getBlockFn) *Downloa
mux: mux, mux: mux,
queue: newQueue(), queue: newQueue(),
peers: newPeerSet(), peers: newPeerSet(),
checks: make(map[common.Hash]time.Time),
hasBlock: hasBlock, hasBlock: hasBlock,
getBlock: getBlock, getBlock: getBlock,
newPeerCh: make(chan *peer, 1), newPeerCh: make(chan *peer, 1),
@ -236,7 +238,6 @@ func (d *Downloader) fetchHashes(p *peer, h common.Hash) error {
timeout = time.NewTimer(hashTTL) // timer to dump a non-responsive active peer timeout = time.NewTimer(hashTTL) // timer to dump a non-responsive active peer
attempted = make(map[string]bool) // attempted peers will help with retries attempted = make(map[string]bool) // attempted peers will help with retries
crossChecks = make(map[common.Hash]time.Time) // running cross checks and their deadline
crossTicker = time.NewTicker(crossCheckCycle) // ticker to periodically check expired cross checks crossTicker = time.NewTicker(crossCheckCycle) // ticker to periodically check expired cross checks
) )
defer crossTicker.Stop() defer crossTicker.Stop()
@ -285,7 +286,7 @@ func (d *Downloader) fetchHashes(p *peer, h common.Hash) error {
cross := inserts[rand.Intn(len(inserts))] cross := inserts[rand.Intn(len(inserts))]
glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross) glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross)
crossChecks[cross] = time.Now().Add(blockTTL) d.checks[cross] = time.Now().Add(blockTTL)
active.getBlocks([]common.Hash{cross}) active.getBlocks([]common.Hash{cross})
// Also fetch a fresh // Also fetch a fresh
@ -306,11 +307,11 @@ func (d *Downloader) fetchHashes(p *peer, h common.Hash) error {
continue continue
} }
hash := blockPack.blocks[0].Hash() hash := blockPack.blocks[0].Hash()
delete(crossChecks, hash) delete(d.checks, hash)
case <-crossTicker.C: case <-crossTicker.C:
// Iterate over all the cross checks and fail the hash chain if they're not verified // Iterate over all the cross checks and fail the hash chain if they're not verified
for hash, deadline := range crossChecks { for hash, deadline := range d.checks {
if time.Now().After(deadline) { if time.Now().After(deadline) {
glog.V(logger.Debug).Infof("Cross check timeout for %x", hash) glog.V(logger.Debug).Infof("Cross check timeout for %x", hash)
return ErrCrossCheckFailed return ErrCrossCheckFailed
@ -362,7 +363,16 @@ out:
select { select {
case <-d.cancelCh: case <-d.cancelCh:
return errCancelBlockFetch return errCancelBlockFetch
case blockPack := <-d.blockCh: case blockPack := <-d.blockCh:
// Short circuit if it's a stale cross check
if len(blockPack.blocks) == 1 {
block := blockPack.blocks[0]
if _, ok := d.checks[block.Hash()]; ok {
delete(d.checks, block.Hash())
continue
}
}
// If the peer was previously banned and failed to deliver it's pack // If the peer was previously banned and failed to deliver it's pack
// in a reasonable time frame, ignore it's message. // in a reasonable time frame, ignore it's message.
if peer := d.peers.Peer(blockPack.peerId); peer != nil { if peer := d.peers.Peer(blockPack.peerId); peer != nil {