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

consider proposal slot in `Slot end`'s `nextActionWait` log/metric (#6026) 

`nextActionWait` currently shows `n/a` if only proposal is scheduled
but no attestation, e.g., attestation was already made for current
epoch and validator is exiting next epoch so doesn't have another
attestation lined up. It's an edge case but it's still more correct
to also log `nextActionWait` if only proposal is scheduled.
This commit is contained in:
Etan Kissling 2024-03-06 12:20:53 +01:00 committed by GitHub
parent 9fda162e99
commit b7c52c9537
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_chain/nimbus_beacon_node.nim
View File

@ -1455,8 +1455,8 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
node.consensusManager[].actionTracker.getNextAttestationSlot(slot) node.consensusManager[].actionTracker.getNextAttestationSlot(slot)
nextProposalSlot = nextProposalSlot =
node.consensusManager[].actionTracker.getNextProposalSlot(slot) node.consensusManager[].actionTracker.getNextProposalSlot(slot)
nextActionWaitTime = saturate(fromNow( nextActionSlot = min(nextAttestationSlot, nextProposalSlot)
node.beaconClock, min(nextAttestationSlot, nextProposalSlot))) nextActionWaitTime = saturate(fromNow(node.beaconClock, nextActionSlot))
# -1 is a more useful output than 18446744073709551615 as an indicator of # -1 is a more useful output than 18446744073709551615 as an indicator of
# no future attestation/proposal known. # no future attestation/proposal known.
@ -1487,7 +1487,7 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
info "Slot end", info "Slot end",
slot = shortLog(slot), slot = shortLog(slot),
nextActionWait = nextActionWait =
if nextAttestationSlot == FAR_FUTURE_SLOT: if nextActionSlot == FAR_FUTURE_SLOT:
"n/a" "n/a"
else: else:
shortLog(nextActionWaitTime), shortLog(nextActionWaitTime),
@ -1496,7 +1496,7 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
syncCommitteeDuties = formatSyncCommitteeStatus(), syncCommitteeDuties = formatSyncCommitteeStatus(),
head = shortLog(head) head = shortLog(head)
if nextAttestationSlot != FAR_FUTURE_SLOT: if nextActionSlot != FAR_FUTURE_SLOT:
next_action_wait.set(nextActionWaitTime.toFloatSeconds) next_action_wait.set(nextActionWaitTime.toFloatSeconds)
let epoch = slot.epoch let epoch = slot.epoch