aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-07-25 18:56:11 +0800
committerGitHub <noreply@github.com>2016-07-25 18:56:11 +0800
commit3e3a79ea136325102e63e962c122da5b44cd9bd5 (patch)
treed4cecedadb9c88e408c103e0503df7508dbb5ab5 /eth
parent771655e3fee585ce4bc47dfaa279557c6c1c2421 (diff)
parentc7c82f1b44e07ad0906dde563cce46ea87b6fc83 (diff)
downloadgo-tangerine-3e3a79ea136325102e63e962c122da5b44cd9bd5.tar.gz
go-tangerine-3e3a79ea136325102e63e962c122da5b44cd9bd5.tar.zst
go-tangerine-3e3a79ea136325102e63e962c122da5b44cd9bd5.zip
Merge pull request #2855 from karalabe/downloader-fix-stall-drop
eth/downloader: fix the stall checks/drops during sync
Diffstat (limited to 'eth')
-rw-r--r--eth/downloader/downloader.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 1e9bc27bc..aee21122a 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -1044,7 +1044,14 @@ func (d *Downloader) fetchParts(errCancel error, deliveryCh chan dataPack, deliv
// Check for fetch request timeouts and demote the responsible peers
for pid, fails := range expire() {
if peer := d.peers.Peer(pid); peer != nil {
- if fails > 1 {
+ // If a lot of retrieval elements expired, we might have overestimated the remote peer or perhaps
+ // ourselves. Only reset to minimal throughput but don't drop just yet. If even the minimal times
+ // out that sync wise we need to get rid of the peer.
+ //
+ // The reason the minimum threshold is 2 is because the downloader tries to estimate the bandwidth
+ // and latency of a peer separately, which requires pushing the measures capacity a bit and seeing
+ // how response times reacts, to it always requests one more than the minimum (i.e. min 2).
+ if fails > 2 {
glog.V(logger.Detail).Infof("%s: %s delivery timeout", peer, strings.ToLower(kind))
setIdle(peer, 0)
} else {