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

eth/downloader: circumvent download race between crosscheck and hashes

Browse Source
This commit is contained in:
Péter Szilágyi 2015-05-15 20:54:10 +03:00
parent 98998534cb
commit f3ae8f50a5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eth/downloader/downloader.go
View File

@ -284,12 +284,14 @@ func (d *Downloader) fetchHashes(p *peer, h common.Hash) error {
} }
if !done { if !done {
// Try and fetch a random block to verify the hash batch // Try and fetch a random block to verify the hash batch
cross := inserts[rand.Intn(len(inserts))] // Skip the last hash as the cross check races with the next hash fetch
glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross) if len(inserts) > 1 {
cross := inserts[rand.Intn(len(inserts)-1)]
d.checks[cross] = time.Now().Add(blockTTL) glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross)
active.getBlocks([]common.Hash{cross})
d.checks[cross] = time.Now().Add(blockTTL)
active.getBlocks([]common.Hash{cross})
}
// Also fetch a fresh // Also fetch a fresh
active.getHashes(head) active.getHashes(head)
continue continue