From 85726fdb025038d06a8e8d0abd4e19d86dd9ef59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 7 May 2019 16:09:11 +0300
Subject: [PATCH] eth/downloader: fix header delays during chain dedup
---
eth/downloader/downloader.go | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 099eb5f47..95f2c2aee 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -892,6 +892,7 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64, pivot uint64)
}
}
// Start pulling the header chain skeleton until all is done
+ ancestor := from
getHeaders(from)
for {
@@ -962,6 +963,12 @@ func (d *Downloader) fetchHeaders(p *peerConnection, from uint64, pivot uint64)
head = full
}
}
+ // If the head is below the common ancestor, we're actually deduplicating
+ // already existing chain segments, so use the ancestor as the fake head.
+ // Otherwise we might end up delaying header deliveries pointlessly.
+ if head < ancestor {
+ head = ancestor
+ }
// If the head is way older than this batch, delay the last few headers
if head+uint64(reorgProtThreshold) < headers[n-1].Number.Uint64() {
delay := reorgProtHeaderDelay
--
GitLab