status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #996 from karalabe/fix-potential-crosscheck-race 

eth/downloader: circumvent download race between crosscheck and hashes
This commit is contained in:
Jeffrey Wilcke 2015-05-15 11:23:44 -07:00
parent cea1723c68 f3ae8f50a5
commit 82c0780f81
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 {
// Try and fetch a random block to verify the hash batch
cross := inserts[rand.Intn(len(inserts))]
glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross)
d.checks[cross] = time.Now().Add(blockTTL)
active.getBlocks([]common.Hash{cross})
// Skip the last hash as the cross check races with the next hash fetch
if len(inserts) > 1 {
cross := inserts[rand.Intn(len(inserts)-1)]
glog.V(logger.Detail).Infof("Cross checking (%s) with %x", active.id, cross)
d.checks[cross] = time.Now().Add(blockTTL)
active.getBlocks([]common.Hash{cross})
}
// Also fetch a fresh
active.getHashes(head)
continue