From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 14 Aug 2025 02:27:23 +0000 (+1000)
Subject: Don't issue webseed requests that clobber pending cancels
X-Git-Tag: v1.59.0~2^2~10
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=c207c7203f48588fd1bf1a945cf0cdcc09532de7;p=btrtrc.git

Don't issue webseed requests that clobber pending cancels
---

diff --git a/webseed-requesting.go b/webseed-requesting.go
index e1b85a35..3bd95f50 100644
--- a/webseed-requesting.go
+++ b/webseed-requesting.go
@@ -424,11 +424,14 @@ func (cl *Client) iterCurrentWebseedRequests() iter.Seq2[webseedUniqueRequestKey
 						// This request is done, so don't yield it.
 						continue
 					}
-					if ar.cancelled.Load() {
-						cl.slogger.Debug("iter current webseed requests: skipped cancelled webseed request")
-						// This should prevent overlapping webseed requests that are just filling
-						// slots waiting to cancel from conflicting.
-						continue
+					// Don't spawn requests before old requests are cancelled.
+					if false {
+						if ar.cancelled.Load() {
+							cl.slogger.Debug("iter current webseed requests: skipped cancelled webseed request")
+							// This should prevent overlapping webseed requests that are just filling
+							// slots waiting to cancel from conflicting.
+							continue
+						}
 					}
 					p := t.piece(t.pieceIndexOfRequestIndex(ar.next))
 					if !yield(