status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

retry sync request when receiving invalid response range (#5615) 

Inform `sync_queue` about inconsistent responses to sync requests
so that the affected requests are retried with a different peer.
This commit is contained in:
Etan Kissling 2023-11-22 09:01:51 +01:00 committed by GitHub
parent c33dd2c170
commit 7554ca2583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_chain/sync/sync_manager.nim
View File

@ -417,6 +417,7 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) {.async.} =
let slots = mapIt(blockData, it[].slot) let slots = mapIt(blockData, it[].slot)
if not(checkResponse(req, slots)): if not(checkResponse(req, slots)):
peer.updateScore(PeerScoreBadResponse) peer.updateScore(PeerScoreBadResponse)
man.queue.push(req)
warn "Received blocks sequence is not in requested range", warn "Received blocks sequence is not in requested range",
blocks_count = len(blockData), blocks_map = blockSmap, blocks_count = len(blockData), blocks_map = blockSmap,
request = req request = req
@ -446,12 +447,15 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) {.async.} =
let uniqueSlots = foldl(slots, combine(a, b), @[slots[0]]) let uniqueSlots = foldl(slots, combine(a, b), @[slots[0]])
if not(checkResponse(req, uniqueSlots)): if not(checkResponse(req, uniqueSlots)):
peer.updateScore(PeerScoreBadResponse) peer.updateScore(PeerScoreBadResponse)
man.queue.push(req)
warn "Received blobs sequence is not in requested range", warn "Received blobs sequence is not in requested range",
blobs_count = len(blobData), blobs_map = getShortMap(req, blobData), blobs_count = len(blobData), blobs_map = getShortMap(req, blobData),
request = req request = req
return return
let groupedBlobs = groupBlobs(req, blockData, blobData) let groupedBlobs = groupBlobs(req, blockData, blobData)
if groupedBlobs.isErr(): if groupedBlobs.isErr():
peer.updateScore(PeerScoreBadResponse)
man.queue.push(req)
warn "Received blobs sequence is invalid", warn "Received blobs sequence is invalid",
blobs_map = getShortMap(req, blobData), request = req, msg=groupedBlobs.error() blobs_map = getShortMap(req, blobData), request = req, msg=groupedBlobs.error()
return return
@ -462,9 +466,9 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) {.async.} =
if blobData.isSome: if blobData.isSome:
let blobs = blobData.get() let blobs = blobData.get()
if len(blobs) != len(blockData): if len(blobs) != len(blockData):
info "block and blobs have different lengths", blobs=len(blobs), blocks=len(blockData)
peer.updateScore(PeerScoreNoValues) peer.updateScore(PeerScoreNoValues)
man.queue.push(req) man.queue.push(req)
info "block and blobs have different lengths", blobs=len(blobs), blocks=len(blockData)
return return
for i, blk in blockData: for i, blk in blockData:
if len(blobs[i]) > 0 and blk[].slot != if len(blobs[i]) > 0 and blk[].slot !=
@ -502,6 +506,7 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) {.async.} =
man.workers[index].status = SyncWorkerStatus.Processing) man.workers[index].status = SyncWorkerStatus.Processing)
except CatchableError as exc: except CatchableError as exc:
man.queue.push(req)
debug "Unexpected exception while receiving blocks", request = req, debug "Unexpected exception while receiving blocks", request = req,
errName = exc.name, errMsg = exc.msg errName = exc.name, errMsg = exc.msg
return return