@@ -111,6 +111,7 @@ import Ouroboros.Consensus.MiniProtocol.LocalTxSubmission.Server
111
111
import Ouroboros.Consensus.Node.Run (SerialiseNodeToNodeConstraints , estimateBlockSize )
112
112
import Ouroboros.Consensus.Node.Tracers
113
113
import qualified Ouroboros.Consensus.Protocol.Ledger.HotKey as HotKey
114
+ import Ouroboros.Consensus.Util.Enclose
114
115
115
116
116
117
@@ -249,58 +250,50 @@ docChainSyncClientEvent' = Documented [
249
250
--------------------------------------------------------------------------------
250
251
251
252
severityChainSyncServerEvent :: TraceChainSyncServerEvent blk -> SeverityS
252
- severityChainSyncServerEvent TraceChainSyncServerRead {} = Info
253
- severityChainSyncServerEvent TraceChainSyncServerReadBlocked {} = Info
254
- severityChainSyncServerEvent TraceChainSyncRollForward {} = Info
255
- severityChainSyncServerEvent TraceChainSyncRollBackward {} = Info
253
+ severityChainSyncServerEvent ( TraceChainSyncServerUpdate _tip _upd _blocking enclosing) =
254
+ case enclosing of
255
+ RisingEdge -> Info
256
+ FallingEdgeWith () -> Debug
256
257
257
258
namesForChainSyncServerEvent :: TraceChainSyncServerEvent blk -> [Text ]
258
259
namesForChainSyncServerEvent ev =
259
260
" ChainSyncServerEvent" : namesForChainSyncServerEvent' ev
260
261
261
262
262
263
namesForChainSyncServerEvent' :: TraceChainSyncServerEvent blk -> [Text ]
263
- namesForChainSyncServerEvent' TraceChainSyncServerRead {} =
264
+ namesForChainSyncServerEvent' ( TraceChainSyncServerUpdate _tip _update NonBlocking _enclosing) =
264
265
[" ServerRead" ]
265
- namesForChainSyncServerEvent' TraceChainSyncServerReadBlocked {} =
266
+ namesForChainSyncServerEvent' ( TraceChainSyncServerUpdate _tip _update Blocking _enclosing) =
266
267
[" ServerReadBlocked" ]
267
- namesForChainSyncServerEvent' TraceChainSyncRollForward {} =
268
- [" RollForward" ]
269
- namesForChainSyncServerEvent' TraceChainSyncRollBackward {} =
270
- [" RollBackward" ]
271
268
272
269
instance ConvertRawHash blk
273
270
=> LogFormatting (TraceChainSyncServerEvent blk ) where
274
- forMachine _dtal (TraceChainSyncServerRead tip (AddBlock _hdr)) =
275
- mconcat
271
+ forMachine _dtal (TraceChainSyncServerUpdate tip (AddBlock _hdr) NonBlocking enclosing ) =
272
+ mconcat $
276
273
[ " kind" .= String " ChainSyncServerRead.AddBlock"
277
274
, tipToObject tip
278
275
]
279
- forMachine _dtal (TraceChainSyncServerRead tip (RollBack _pt)) =
280
- mconcat
276
+ <> [ " risingEdge" .= True | RisingEdge <- [enclosing] ]
277
+ forMachine _dtal (TraceChainSyncServerUpdate tip (RollBack _pt) NonBlocking enclosing) =
278
+ mconcat $
281
279
[ " kind" .= String " ChainSyncServerRead.RollBack"
282
280
, tipToObject tip
283
281
]
284
- forMachine _dtal (TraceChainSyncServerReadBlocked tip (AddBlock _hdr)) =
285
- mconcat
282
+ <> [ " risingEdge" .= True | RisingEdge <- [enclosing] ]
283
+ forMachine _dtal (TraceChainSyncServerUpdate tip (AddBlock _pt) Blocking enclosing) =
284
+ mconcat $
286
285
[ " kind" .= String " ChainSyncServerReadBlocked.AddBlock"
287
286
, tipToObject tip
288
287
]
289
- forMachine _dtal (TraceChainSyncServerReadBlocked tip (RollBack _pt)) =
290
- mconcat
288
+ <> [ " risingEdge" .= True | RisingEdge <- [enclosing] ]
289
+ forMachine _dtal (TraceChainSyncServerUpdate tip (RollBack _pt) Blocking enclosing) =
290
+ mconcat $
291
291
[ " kind" .= String " ChainSyncServerReadBlocked.RollBack"
292
292
, tipToObject tip
293
293
]
294
- forMachine dtal (TraceChainSyncRollForward point) =
295
- mconcat [ " kind" .= String " ChainSyncServerRead.RollForward"
296
- , " point" .= forMachine dtal point
297
- ]
298
- forMachine dtal (TraceChainSyncRollBackward point) =
299
- mconcat [ " kind" .= String " ChainSyncServerRead.ChainSyncRollBackward"
300
- , " point" .= forMachine dtal point
301
- ]
294
+ <> [ " risingEdge" .= True | RisingEdge <- [enclosing] ]
302
295
303
- asMetrics (TraceChainSyncRollForward _point ) =
296
+ asMetrics (TraceChainSyncServerUpdate _tip ( AddBlock _hdr) _blocking FallingEdge ) =
304
297
[CounterM " cardano.node.chainSync.rollForward" Nothing ]
305
298
asMetrics _ = []
306
299
@@ -912,22 +905,24 @@ severityForge' :: TraceLabelCreds (TraceForgeEvent blk) -> SeverityS
912
905
severityForge' (TraceLabelCreds _t e) = severityForge'' e
913
906
914
907
severityForge'' :: TraceForgeEvent blk -> SeverityS
915
- severityForge'' TraceStartLeadershipCheck {} = Info
916
- severityForge'' TraceSlotIsImmutable {} = Error
917
- severityForge'' TraceBlockFromFuture {} = Error
918
- severityForge'' TraceBlockContext {} = Debug
919
- severityForge'' TraceNoLedgerState {} = Error
920
- severityForge'' TraceLedgerState {} = Debug
921
- severityForge'' TraceNoLedgerView {} = Error
922
- severityForge'' TraceLedgerView {} = Debug
923
- severityForge'' TraceForgeStateUpdateError {} = Error
924
- severityForge'' TraceNodeCannotForge {} = Error
925
- severityForge'' TraceNodeNotLeader {} = Info
926
- severityForge'' TraceNodeIsLeader {} = Info
927
- severityForge'' TraceForgedBlock {} = Info
928
- severityForge'' TraceDidntAdoptBlock {} = Error
929
- severityForge'' TraceForgedInvalidBlock {} = Error
930
- severityForge'' TraceAdoptedBlock {} = Info
908
+ severityForge'' TraceStartLeadershipCheck {} = Info
909
+ severityForge'' TraceSlotIsImmutable {} = Error
910
+ severityForge'' TraceBlockFromFuture {} = Error
911
+ severityForge'' TraceBlockContext {} = Debug
912
+ severityForge'' TraceNoLedgerState {} = Error
913
+ severityForge'' TraceLedgerState {} = Debug
914
+ severityForge'' TraceNoLedgerView {} = Error
915
+ severityForge'' TraceLedgerView {} = Debug
916
+ severityForge'' TraceForgeStateUpdateError {} = Error
917
+ severityForge'' TraceNodeCannotForge {} = Error
918
+ severityForge'' TraceNodeNotLeader {} = Info
919
+ severityForge'' TraceNodeIsLeader {} = Info
920
+ severityForge'' TraceForgeTickedLedgerState {} = Debug
921
+ severityForge'' TraceForgingMempoolSnapshot {} = Debug
922
+ severityForge'' TraceForgedBlock {} = Info
923
+ severityForge'' TraceDidntAdoptBlock {} = Error
924
+ severityForge'' TraceForgedInvalidBlock {} = Error
925
+ severityForge'' TraceAdoptedBlock {} = Info
931
926
932
927
severityForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> SeverityS
933
928
severityForge''' _ = Info
@@ -940,22 +935,24 @@ namesForForge' :: TraceLabelCreds (TraceForgeEvent blk) -> [Text]
940
935
namesForForge' (TraceLabelCreds _t e) = namesForForge'' e
941
936
942
937
namesForForge'' :: TraceForgeEvent blk -> [Text ]
943
- namesForForge'' TraceStartLeadershipCheck {} = [" StartLeadershipCheck" ]
944
- namesForForge'' TraceSlotIsImmutable {} = [" SlotIsImmutable" ]
945
- namesForForge'' TraceBlockFromFuture {} = [" BlockFromFuture" ]
946
- namesForForge'' TraceBlockContext {} = [" BlockContext" ]
947
- namesForForge'' TraceNoLedgerState {} = [" NoLedgerState" ]
948
- namesForForge'' TraceLedgerState {} = [" LedgerState" ]
949
- namesForForge'' TraceNoLedgerView {} = [" NoLedgerView" ]
950
- namesForForge'' TraceLedgerView {} = [" LedgerView" ]
951
- namesForForge'' TraceForgeStateUpdateError {} = [" ForgeStateUpdateError" ]
952
- namesForForge'' TraceNodeCannotForge {} = [" NodeCannotForge" ]
953
- namesForForge'' TraceNodeNotLeader {} = [" NodeNotLeader" ]
954
- namesForForge'' TraceNodeIsLeader {} = [" NodeIsLeader" ]
955
- namesForForge'' TraceForgedBlock {} = [" ForgedBlock" ]
956
- namesForForge'' TraceDidntAdoptBlock {} = [" DidntAdoptBlock" ]
957
- namesForForge'' TraceForgedInvalidBlock {} = [" ForgedInvalidBlock" ]
958
- namesForForge'' TraceAdoptedBlock {} = [" AdoptedBlock" ]
938
+ namesForForge'' TraceStartLeadershipCheck {} = [" StartLeadershipCheck" ]
939
+ namesForForge'' TraceSlotIsImmutable {} = [" SlotIsImmutable" ]
940
+ namesForForge'' TraceBlockFromFuture {} = [" BlockFromFuture" ]
941
+ namesForForge'' TraceBlockContext {} = [" BlockContext" ]
942
+ namesForForge'' TraceNoLedgerState {} = [" NoLedgerState" ]
943
+ namesForForge'' TraceLedgerState {} = [" LedgerState" ]
944
+ namesForForge'' TraceNoLedgerView {} = [" NoLedgerView" ]
945
+ namesForForge'' TraceLedgerView {} = [" LedgerView" ]
946
+ namesForForge'' TraceForgeStateUpdateError {} = [" ForgeStateUpdateError" ]
947
+ namesForForge'' TraceNodeCannotForge {} = [" NodeCannotForge" ]
948
+ namesForForge'' TraceNodeNotLeader {} = [" NodeNotLeader" ]
949
+ namesForForge'' TraceNodeIsLeader {} = [" NodeIsLeader" ]
950
+ namesForForge'' TraceForgeTickedLedgerState {} = [" ForgeTickedLedgerState" ]
951
+ namesForForge'' TraceForgingMempoolSnapshot {} = [" ForgingMempoolSnapshot" ]
952
+ namesForForge'' TraceForgedBlock {} = [" ForgedBlock" ]
953
+ namesForForge'' TraceDidntAdoptBlock {} = [" DidntAdoptBlock" ]
954
+ namesForForge'' TraceForgedInvalidBlock {} = [" ForgedInvalidBlock" ]
955
+ namesForForge'' TraceAdoptedBlock {} = [" AdoptedBlock" ]
959
956
960
957
namesForForge''' :: TraceLabelCreds TraceStartLeadershipCheckPlus -> [Text ]
961
958
namesForForge''' (TraceLabelCreds _ TraceStartLeadershipCheckPlus {}) =
@@ -1045,6 +1042,20 @@ instance ( tx ~ GenTx blk
1045
1042
[ " kind" .= String " TraceNodeIsLeader"
1046
1043
, " slot" .= toJSON (unSlotNo slotNo)
1047
1044
]
1045
+ forMachine dtal (TraceForgeTickedLedgerState slotNo prevPt) =
1046
+ mconcat
1047
+ [ " kind" .= String " TraceForgeTickedLedgerState"
1048
+ , " slot" .= toJSON (unSlotNo slotNo)
1049
+ , " prev" .= renderPointForDetails dtal prevPt
1050
+ ]
1051
+ forMachine dtal (TraceForgingMempoolSnapshot slotNo prevPt mpHash mpSlot) =
1052
+ mconcat
1053
+ [ " kind" .= String " TraceForgingMempoolSnapshot"
1054
+ , " slot" .= toJSON (unSlotNo slotNo)
1055
+ , " prev" .= renderPointForDetails dtal prevPt
1056
+ , " mempoolHash" .= String (renderChainHash @ blk (renderHeaderHash (Proxy @ blk )) mpHash)
1057
+ , " mempoolSlot" .= toJSON (unSlotNo mpSlot)
1058
+ ]
1048
1059
forMachine _dtal (TraceForgedBlock slotNo _ blk _) =
1049
1060
mconcat
1050
1061
[ " kind" .= String " TraceForgedBlock"
@@ -1133,6 +1144,20 @@ instance ( tx ~ GenTx blk
1133
1144
" Not leading slot " <> showT (unSlotNo slotNo)
1134
1145
forHuman (TraceNodeIsLeader slotNo) =
1135
1146
" Leading slot " <> showT (unSlotNo slotNo)
1147
+ forHuman (TraceForgeTickedLedgerState slotNo prevPt) =
1148
+ " While forging in slot "
1149
+ <> showT (unSlotNo slotNo)
1150
+ <> " we ticked the ledger state ahead from "
1151
+ <> renderPointAsPhrase prevPt
1152
+ forHuman (TraceForgingMempoolSnapshot slotNo prevPt mpHash mpSlot) =
1153
+ " While forging in slot "
1154
+ <> showT (unSlotNo slotNo)
1155
+ <> " we acquired a mempool snapshot valid against "
1156
+ <> renderPointAsPhrase prevPt
1157
+ <> " from a mempool that was prepared for "
1158
+ <> renderChainHash @ blk (renderHeaderHash (Proxy @ blk )) mpHash
1159
+ <> " ticked to slot "
1160
+ <> showT (unSlotNo mpSlot)
1136
1161
forHuman (TraceForgedBlock slotNo _ _ _) =
1137
1162
" Forged block in slot " <> showT (unSlotNo slotNo)
1138
1163
forHuman (TraceDidntAdoptBlock slotNo _) =
@@ -1189,6 +1214,8 @@ instance ( tx ~ GenTx blk
1189
1214
[IntM " cardano.node.nodeNotLeader" (fromIntegral $ unSlotNo slot)]
1190
1215
asMetrics (TraceNodeIsLeader slot) =
1191
1216
[IntM " cardano.node.nodeIsLeader" (fromIntegral $ unSlotNo slot)]
1217
+ asMetrics TraceForgeTickedLedgerState {} = []
1218
+ asMetrics TraceForgingMempoolSnapshot {} = []
1192
1219
asMetrics (TraceForgedBlock slot _ _ _) =
1193
1220
[IntM " cardano.node.forgedSlotLast" (fromIntegral $ unSlotNo slot)]
1194
1221
asMetrics (TraceDidntAdoptBlock slot _) =
0 commit comments