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

Eliminate duplicate `direction` fields. 

Debugging blobs map.
This commit is contained in:
cheatfate 2024-11-30 15:05:37 +02:00
parent 3a51d29186
commit f5ed6004ff
No known key found for this signature in database
GPG Key ID: 46ADD633A7201F95
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/sync/sync_manager.nim
View File

@ -201,11 +201,9 @@ proc getBlocks[A, B](man: SyncManager[A, B], peer: A,
doAssert(not(req.isEmpty()), "Request must not be empty!")
debug "Requesting blocks from peer",
request = req,
peer = req.item,
peer_score = req.item.getScore(),
peer_speed = req.item.netKbps(),
sync_ident = man.ident,
direction = man.direction,
topics = "syncman"
beaconBlocksByRange_v2(peer, req.data.slot, req.data.count, 1'u64)
@ -230,11 +228,9 @@ proc getBlobSidecars[A, B](man: SyncManager[A, B], peer: A,
doAssert(not(req.isEmpty()), "Request must not be empty!")
debug "Requesting blobs sidecars from peer",
request = req,
peer = req.item,
peer_score = req.item.getScore(),
peer_speed = req.item.netKbps(),
sync_ident = man.ident,
direction = man.direction,
topics = "syncman"
blobSidecarsByRange(peer, req.data.slot, req.data.count)
@ -406,14 +402,12 @@ proc getSyncBlockData[A, B](
debug "Received blocks on request",
request = sr,
peer = sr.item,
peer_score = sr.item.getScore(),
peer_speed = sr.item.netKbps(),
index = index,
blocks_count = len(blocks),
blocks_map = getShortMap(sr, blocks.toSeq()),
sync_ident = man.ident,
direction = man.direction,
topics = "syncman"
checkResponse(sr, blockSlots).isOkOr:
@ -443,15 +437,12 @@ proc getSyncBlockData[A, B](
debug "Received blobs on request",
request = sr,
peer = sr.item,
peer_score = sr.item.getScore(),
peer_speed = sr.item.netKbps(),
index = index,
blobs_count = len(blobData),
blobs_map = getShortMap(sr, blobData),
debug_map = getFullMap(sr, blobData),
sync_ident = man.ident,
direction = man.direction,
topics = "syncman"
if len(blobData) > 0:

28
beacon_chain/sync/sync_queue.nim
View File

@ -147,6 +147,9 @@ func getShortMap*[T](
proc getShortMap*[T](req: SyncRequest[T],
data: openArray[ref BlobSidecar]): string =
static:
doAssert(MAX_BLOBS_PER_BLOCK < 10, "getShortMap(Blobs) should be revisited")
var
res = newStringOfCap(req.data.count)
slider = req.data.slot
@ -170,11 +173,6 @@ proc getShortMap*[T](req: SyncRequest[T],
slider = slider + 1
res
proc getFullMap*[T](req: SyncRequest[T],
data: openArray[ref BlobSidecar]): string =
data.mapIt("(" & $it[].signed_block_header.message.slot & ", " & $uint64(it[].index) & ")").join(", ")
proc getShortMap*[T](
req: SyncRequest[T],
blobs: openArray[BlobSidecars]
@ -190,11 +188,8 @@ proc getShortMap*[T](
for i in 0 ..< req.data.count:
if last < len(blobs):
if len(blobs[last]) > 0:
let
sidecar = blobs[last][0]
length = len(blobs[last])
if sidecar.signed_block_header.message.slot == slider:
res.add(Base10.toString(uint64(length)))
if blobs[last][0][].signed_block_header.message.slot == slider:
res.add(Base10.toString(lenu64(blobs[last])))
inc(last)
else:
res.add('.')
@ -203,7 +198,7 @@ proc getShortMap*[T](
else:
res.add('.')
inc(slider)
res
res & " (" & blobs.mapIt($len(it)).join(", ") & ")"
proc getShortMap*[T](
req: SyncRequest[T],
@ -783,7 +778,6 @@ proc push*[T](
debug "Request is no more relevant",
request = sr,
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
# Request is not in queue anymore, probably reset happened.
return
@ -799,7 +793,6 @@ proc push*[T](
debug "Request is no more relevant, reset happen",
request = sr,
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
return
except CancelledError as exc:
@ -816,7 +809,6 @@ proc push*[T](
debug "Request is no more relevant",
request = sr,
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
return
@ -834,7 +826,6 @@ proc push*[T](
blocks_map = getShortMap(sr, data),
blobs_map = getShortMap(sr, blobs),
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
sr.item.updateStats(SyncResponseKind.Empty, 1'u64)
@ -849,7 +840,6 @@ proc push*[T](
blocks_map = getShortMap(sr, data),
blobs_map = getShortMap(sr, blobs),
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
sq.gapList.reset()
sq.advanceQueue()
@ -863,7 +853,6 @@ proc push*[T](
blocks_map = getShortMap(sr, data),
blobs_map = getShortMap(sr, blobs),
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
inc(sq.requests[position.qindex].failuresCount)
@ -878,7 +867,6 @@ proc push*[T](
blocks_map = getShortMap(sr, data),
blobs_map = getShortMap(sr, blobs),
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
sr.item.updateScore(PeerScoreUnviableFork)
@ -907,14 +895,14 @@ proc push*[T](
# Responses which has at least one good block and a gap does not affect
# failures count
debug "Unexpected missing parent, but no rewind needed",
request = sr, finalized_slot = sq.getSafeSlot(),
request = sr,
finalized_slot = sq.getSafeSlot(),
missing_parent_block = pres.blck,
failures_count = sq.requests[position.qindex].failuresCount,
blocks_count = len(data),
blocks_map = getShortMap(sr, data),
blobs_map = getShortMap(sr, blobs),
sync_ident = sq.ident,
direction = sq.kind,
topics = "syncman"
sr.item.updateScore(PeerScoreMissingValues)