logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-01-24 08:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

wiptesting

Browse Source
This commit is contained in:
benbierens 2024-12-19 16:38:09 +01:00
parent 23c0f30977
commit 9d1471ce05
No known key found for this signature in database
GPG Key ID: 877D2C2E09A22F3A
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,9 @@ type
# attach task scheduler to engine
proc scheduleTask(b: BlockExcEngine, task: BlockExcPeerCtx): bool {.gcsafe} =
b.taskQueue.pushOrUpdateNoWait(task).isOk()
let val = b.taskQueue.pushOrUpdateNoWait(task).isOk()
trace "Task scheduled", peerId = task.id
val
proc blockexcTaskRunner(b: BlockExcEngine) {.async: (raises: []).}
@ -221,6 +223,7 @@ proc blockPresenceHandler*(
if peerCtx.isNil:
return
trace "Handling blockPresences", addrs = blocks.mapIt(it.address)
for blk in blocks:
if presence =? Presence.init(blk):
peerCtx.setPresence(presence)
@ -283,6 +286,7 @@ proc cancelBlocks(b: BlockExcEngine, addrs: seq[BlockAddress]) {.async.} =
warn "Failed to send block request cancellations to peers", peers = failed.len
proc resolveBlocks*(b: BlockExcEngine, blocksDelivery: seq[BlockDelivery]) {.async.} =
trace "Resolving blocks", addrs = blocksDelivery.mapIt(it.address)
b.pendingBlocks.resolve(blocksDelivery)
await b.scheduleTasks(blocksDelivery)
await b.cancelBlocks(blocksDelivery.mapIt(it.address))
@ -399,11 +403,14 @@ proc wantListHandler*(
peer = peerCtx.id
address = e.address
wantType = $e.wantType
isCancel = $e.cancel
# Update metrics
if e.wantType == WantType.WantHave:
trace "Received wantHave"
codex_block_exchange_want_have_lists_received.inc()
elif e.wantType == WantType.WantBlock:
trace "Received wantBlock"
schedulePeer = true
codex_block_exchange_want_block_lists_received.inc()
@ -451,7 +458,7 @@ proc wantListHandler*(
peerCtx.peerWants[idx] = e # update entry
if presence.len > 0:
trace "Sending presence to remote", items = presence.mapIt($it).join(",")
trace "Sending presence", addrs = presence.mapIt(it.address)
await b.network.request.sendPresence(peer, presence)
if schedulePeer:
@ -543,6 +550,8 @@ proc taskHandler*(b: BlockExcEngine, task: BlockExcPeerCtx) {.gcsafe, async.} =
updateInFlight(wantAddresses, true)
wantsBlocks.sort(SortOrder.Descending)
trace "Begin sending blocks", addrs = wantAddresses
proc localLookup(e: WantListEntry): Future[?!BlockDelivery] {.async.} =
if e.address.leaf:
(await b.localStore.getBlockAndProof(e.address.treeCid, e.address.index)).map(
@ -574,8 +583,9 @@ proc taskHandler*(b: BlockExcEngine, task: BlockExcPeerCtx) {.gcsafe, async.} =
)
codex_block_exchange_blocks_sent.inc(blocksDelivery.len.int64)
task.peerWants.keepItIf(it.address notin successAddresses)
trace "Finished sending blocks", addrs = wantAddresses
proc blockexcTaskRunner(b: BlockExcEngine) {.async: (raises: []).} =
## process tasks

2
docker/build.bat Normal file
View File

@ -0,0 +1,2 @@
docker build --build-arg MAKE_PARALLEL=4 --build-arg NIMFLAGS="-d:disableMarchNative -d:codex_enable_api_debug_peers=true -d:codex_enable_proof_failures=true -d:codex_use_hardhat=false -d:codex_enable_log_counter=true -d:verify_circuit=true" --build-arg NAT_IP_AUTO=true -t thatbenbierens/nim-codex:blkex-cancelpresence-13 -f codex.Dockerfile ..
docker push thatbenbierens/nim-codex:blkex-cancelpresence-13