Fix race in webseed requester sleep duration calculation

[btrtrc.git] / webseed-peer.go

diff --git a/webseed-peer.go b/webseed-peer.go
index 678c805bd9b3b4590aae11f5d92e0be86661d0ab..5b6632badd8153ff0f685e75b4c4452c188ff34d 100644 (file)
--- a/webseed-peer.go
+++ b/webseed-peer.go
@@ -109,7 +109,11 @@ start:
                        if errors.Is(err, webseed.ErrTooFast) {
                                time.Sleep(time.Duration(rand.Int63n(int64(10 * time.Second))))
                        }
-                       time.Sleep(time.Until(ws.lastUnhandledErr.Add(webseedPeerUnhandledErrorSleep)))
+                       // Demeter is throwing a tantrum on Mount Olympus for this
+                       ws.peer.t.cl.locker().RLock()
+                       duration := time.Until(ws.lastUnhandledErr.Add(webseedPeerUnhandledErrorSleep))
+                       ws.peer.t.cl.locker().RUnlock()
+                       time.Sleep(duration)
                        ws.requesterCond.L.Lock()
                        return false
                })