Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix block replay tracer in new tracing system #6091

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Fix block replay tracer in new tracing system #6091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/BlockReplayProgress.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Cardano.Node.Tracing.Tracers.BlockReplayProgress
import Cardano.Api (textShow)

import Cardano.Logging
import Ouroboros.Consensus.Block (realPointSlot)
import Ouroboros.Consensus.Block (SlotNo, realPointSlot)
import qualified Ouroboros.Consensus.Storage.ChainDB as ChainDB
import qualified Ouroboros.Consensus.Storage.LedgerDB as LedgerDB
import Ouroboros.Network.Block (pointSlot, unSlotNo)
Expand All @@ -20,12 +20,14 @@ import Data.Text (pack)

data ReplayBlockStats = ReplayBlockStats
{ rpsDisplay :: Bool
, rpsCurSlot :: SlotNo
, rpsGoalSlot :: SlotNo
, rpsProgress :: Double
, rpsLastProgress :: Double
}

emptyReplayBlockStats :: ReplayBlockStats
emptyReplayBlockStats = ReplayBlockStats False 0.0 0.0
emptyReplayBlockStats = ReplayBlockStats False 0 0 0.0 0.0

--------------------------------------------------------------------------------
-- ReplayBlockStats Tracer
Expand All @@ -37,7 +39,15 @@ instance LogFormatting ReplayBlockStats where
[ "kind" .= String "ReplayBlockStats"
, "progress" .= String (pack $ show rpsProgress)
]
forHuman ReplayBlockStats {..} = "Block replay progress " <> textShow rpsProgress <> "%"
forHuman ReplayBlockStats {..} = "Replayed block: slot " <> textShow (unSlotNo rpsCurSlot) <> " out of " <> textShow (unSlotNo rpsGoalSlot) <> ". Progress: " <> textShow (round2 rpsProgress) <> "%"
where
round2 :: Double -> Double
round2 num =
let
f :: Int
f = round $ num * 100
in fromIntegral f / 100

asMetrics ReplayBlockStats {..} =
[DoubleM "blockReplayProgress" rpsProgress]

Expand Down Expand Up @@ -75,12 +85,12 @@ replayBlockStats :: MonadIO m
-> m ReplayBlockStats
replayBlockStats ReplayBlockStats {..} _context
(ChainDB.TraceLedgerReplayEvent (LedgerDB.ReplayedBlock pt []
(LedgerDB.ReplayStart replayTo) _)) = do
let slotno = toInteger $ unSlotNo (realPointSlot pt)
endslot = toInteger $ withOrigin 0 unSlotNo (pointSlot replayTo)
progress' = (fromInteger slotno * 100.0) / fromInteger (max slotno endslot)
_ (LedgerDB.ReplayGoal replayTo))) = do
let slotno = realPointSlot pt
endslot = withOrigin 0 id $ pointSlot replayTo
progress' = (fromIntegral (unSlotNo slotno) * 100.0) / fromIntegral (unSlotNo $ max slotno endslot)
pure $ if (progress' == 0.0 && not rpsDisplay)
|| ((progress' - rpsLastProgress) > 1.0)
then ReplayBlockStats True progress' progress'
else ReplayBlockStats False progress' rpsLastProgress
|| ((progress' - rpsLastProgress) > 0.1)
then ReplayBlockStats True slotno endslot progress' progress'
else ReplayBlockStats False slotno endslot progress' rpsLastProgress
replayBlockStats st@ReplayBlockStats {} _context _ = pure st
Loading