cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

eth/downloader: fix race causing occasional test failure

Browse Source
This commit is contained in:
Péter Szilágyi 2015-09-01 16:11:14 +03:00
parent 9dc23ce284
commit 1f1d73ab74
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eth/downloader/downloader.go
View File

@ -739,9 +739,11 @@ func (d *Downloader) fetchBlocks61(from uint64) error {
break break
} }
// Send a download request to all idle peers, until throttled // Send a download request to all idle peers, until throttled
throttled := false
for _, peer := range d.peers.IdlePeers() { for _, peer := range d.peers.IdlePeers() {
// Short circuit if throttling activated // Short circuit if throttling activated
if d.queue.Throttle() { if d.queue.Throttle() {
throttled = true
break break
} }
// Reserve a chunk of hashes for a peer. A nil can mean either that // Reserve a chunk of hashes for a peer. A nil can mean either that
@ -762,7 +764,7 @@ func (d *Downloader) fetchBlocks61(from uint64) error {
} }
// Make sure that we have peers available for fetching. If all peers have been tried // Make sure that we have peers available for fetching. If all peers have been tried
// and all failed throw an error // and all failed throw an error
if !d.queue.Throttle() && d.queue.InFlight() == 0 { if !throttled && d.queue.InFlight() == 0 {
return errPeersUnavailable return errPeersUnavailable
} }
} }