requesting.go | 11 ++++++++++- diff --git a/requesting.go b/requesting.go index a59250375ada02b3dd3f8672d75a63bca9493bd5..7ecb4e222169bc0c8129e731ca8d3df393db3433 100644 --- a/requesting.go +++ b/requesting.go @@ -311,13 +311,22 @@ req := heap.Pop(requestHeap) if cap(next.Requests.requestIndexes) != cap(orig) { panic("changed") } + + if p.needRequestUpdate == "Peer.remoteRejectedRequest" { + continue + } + existing := t.requestingPeer(req) if existing != nil && existing != p { + if p.needRequestUpdate == "Peer.cancel" { + continue + } + // Don't steal from the poor. diff := int64(current.Requests.GetCardinality()) + 1 - (int64(existing.uncancelledRequests()) - 1) // Steal a request that leaves us with one more request than the existing peer // connection if the stealer more recently received a chunk. - if diff > 1 || (diff == 1 && p.lastUsefulChunkReceived.Before(existing.lastUsefulChunkReceived)) { + if diff > 1 || (diff == 1 && !p.lastUsefulChunkReceived.After(existing.lastUsefulChunkReceived)) { continue } t.cancelRequest(req)