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

downloader: throw an error if there are no peers available for download

Browse Source 
If all peers have been tried during the block download process and some
hashes are unfetchable (available peers > 0 and fetching == 0) throw an
error so the process can be aborted.
This commit is contained in:
obscuren 2015-04-18 19:29:30 +02:00
parent 78e37e98e7
commit 7c5d50f627
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eth/downloader/downloader.go
View File

@ -32,6 +32,7 @@ var (
errBadPeer = errors.New("action from bad peer ignored") errBadPeer = errors.New("action from bad peer ignored")
errTimeout = errors.New("timeout") errTimeout = errors.New("timeout")
errEmptyHashSet = errors.New("empty hash set by peer") errEmptyHashSet = errors.New("empty hash set by peer")
errPeersUnavailable = errors.New("no peers available or all peers tried for block download process")
) )
type hashCheckFn func(common.Hash) bool type hashCheckFn func(common.Hash) bool
@ -293,6 +294,15 @@ out:
d.queue.put(chunk.hashes) d.queue.put(chunk.hashes)
} }
} }
// make sure that we have peers available for fetching. If all peers have been tried
// and all failed throw an error
if len(availablePeers) > 0 && d.queue.fetchPool.Size() == 0 {
d.queue.reset()
return errPeersUnavailable
}
} else if len(d.queue.fetching) == 0 { } else if len(d.queue.fetching) == 0 {
// When there are no more queue and no more `fetching`. We can // When there are no more queue and no more `fetching`. We can
// safely assume we're done. Another part of the process will check // safely assume we're done. Another part of the process will check