downloader: free up peers from work when the downloader resets

1 files changed, 9 insertions, 4 deletions

diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 5745bf1f8..ce3aa9850 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -60,13 +60,18 @@ func (c *queue) get(p *peer, max int) *chunk {
 			return false
 		}
 
-		hashes.Add(v)
-		i++
+		// Skip any hashes that have previously been requested from the peer
+		if !p.requested.Has(v) {
+			hashes.Add(v)
+			i++
+		}
 
 		return true
 	})
-	// remove hashes that have previously been fetched
-	hashes.Separate(p.requested)
+	// if no hashes can be requested return a nil chunk
+	if hashes.Size() == 0 {
+		return nil
+	}
 
 	// remove the fetchable hashes from hash pool
 	c.hashPool.Separate(hashes)