codex-storage/nim-codex
1
0
Fork 0
mirror of https://github.com/codex-storage/nim-codex.git synced 2025-02-10 11:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevents duplicate scheduling. Fixes cancellation

Browse Source
This commit is contained in:
benbierens 2024-12-05 19:52:57 +01:00
parent 532b83a52b
commit 1f063fe163
No known key found for this signature in database
GPG Key ID: 877D2C2E09A22F3A
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
codex/blockexchange/engine/engine.nim
View File

@ -270,7 +270,7 @@ proc scheduleTasks(b: BlockExcEngine, blocksDelivery: seq[BlockDelivery]) {.asyn
proc cancelBlocks(b: BlockExcEngine, addrs: seq[BlockAddress]) {.async.} = proc cancelBlocks(b: BlockExcEngine, addrs: seq[BlockAddress]) {.async.} =
## Tells neighboring peers that we're no longer interested in a block. ## Tells neighboring peers that we're no longer interested in a block.
trace "Sending block request cancellations to peers", addrs = addrs.len trace "Sending block request cancellations to peers", addrs, peers = b.peers.mapIt($it.id)
let failed = (await allFinished( let failed = (await allFinished(
b.peers.mapIt( b.peers.mapIt(
@ -389,6 +389,7 @@ proc wantListHandler*(
var var
presence: seq[BlockPresence] presence: seq[BlockPresence]
schedulePeer = false
for e in wantList.entries: for e in wantList.entries:
let let
@ -398,16 +399,19 @@ proc wantListHandler*(
peer = peerCtx.id peer = peerCtx.id
address = e.address address = e.address
wantType = $e.wantType wantType = $e.wantType
isCancel = $e.cancel
# Update metrics # Update metrics
if e.wantType == WantType.WantHave: if e.wantType == WantType.WantHave:
codex_block_exchange_want_have_lists_received.inc() codex_block_exchange_want_have_lists_received.inc()
elif e.wantType == WantType.WantBlock: elif e.wantType == WantType.WantBlock:
schedulePeer = true
codex_block_exchange_want_block_lists_received.inc() codex_block_exchange_want_block_lists_received.inc()
# Update peerCtx # Update peerCtx
if idx < 0: # new entry if idx < 0: # new entry
peerCtx.peerWants.add(e) if not e.cancel:
peerCtx.peerWants.add(e)
else: # update existing entry else: # update existing entry
# peer doesn't want this block anymore # peer doesn't want this block anymore
if e.cancel: if e.cancel:
@ -439,15 +443,14 @@ proc wantListHandler*(
`type`: BlockPresenceType.Have, `type`: BlockPresenceType.Have,
price: price)) price: price))
# Schedule handling of wantBlocks
if e.wantType == WantType.WantBlock:
if not b.scheduleTask(peerCtx):
warn "Unable to schedule task for peer", peer
if presence.len > 0: if presence.len > 0:
trace "Sending presence to remote", items = presence.mapIt($it).join(",") trace "Sending presence to remote", items = presence.mapIt($it).join(",")
await b.network.request.sendPresence(peer, presence) await b.network.request.sendPresence(peer, presence)
if schedulePeer:
if not b.scheduleTask(peerCtx):
warn "Unable to schedule task for peer", peer
proc accountHandler*( proc accountHandler*(
engine: BlockExcEngine, engine: BlockExcEngine,
peer: PeerId, peer: PeerId,