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

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.
pull/749/head
obscuren 10 years ago
parent 78e37e98e7
commit 7c5d50f627
  1. 22
      eth/downloader/downloader.go

@ -26,12 +26,13 @@ const (
) )
var ( var (
errLowTd = errors.New("peer's TD is too low") errLowTd = errors.New("peer's TD is too low")
errBusy = errors.New("busy") errBusy = errors.New("busy")
errUnknownPeer = errors.New("peer's unknown or unhealthy") errUnknownPeer = errors.New("peer's unknown or unhealthy")
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

Loading…
Cancel
Save