diff --git a/CHANGELOG.md b/CHANGELOG.md index e0ee0a3f26..64c3c2edfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Fix a bug in how the last timeout certificate is recovered at start-up. - Fix the behaviour of the block last finalized pointer in the `GetBlockInfo` so that it consistently returns the last finalized block at the time the block was baked. +- Add debug-level logging when a round is advanced, either due to a quorum certificate or a + timeout certificate. ## 6.0.4 diff --git a/concordium-consensus/src/Concordium/KonsensusV1/Consensus.hs b/concordium-consensus/src/Concordium/KonsensusV1/Consensus.hs index f6ebb45211..77c1df118c 100644 --- a/concordium-consensus/src/Concordium/KonsensusV1/Consensus.hs +++ b/concordium-consensus/src/Concordium/KonsensusV1/Consensus.hs @@ -118,11 +118,14 @@ onNewRound = do advanceRoundWithTimeout :: ( MonadTimeout m, LowLevel.MonadTreeStateStore m, - MonadState (SkovData (MPV m)) m + MonadState (SkovData (MPV m)) m, + MonadLogger m ) => RoundTimeout (MPV m) -> m () advanceRoundWithTimeout roundTimeout@RoundTimeout{..} = do + logEvent Konsensus LLDebug $ + "Advancing round: round " ++ show (tcRound rtTimeoutCertificate) ++ " timed out." onNewRound roundStatus %=! updateQC . updateTC . (rsRoundEligibleToBake .~ True) updatePersistentRoundStatus (prsLatestTimeout .~ Present rtTimeoutCertificate) @@ -142,12 +145,18 @@ advanceRoundWithTimeout roundTimeout@RoundTimeout{..} = do -- * The certified block MUST be for a round that is at least the current round. advanceRoundWithQuorum :: ( MonadTimeout m, - MonadState (SkovData (MPV m)) m + MonadState (SkovData (MPV m)) m, + MonadLogger m ) => -- |Certified block CertifiedBlock (MPV m) -> m () advanceRoundWithQuorum certBlock = do + logEvent Konsensus LLDebug $ + "Advancing round: round " + ++ show (qcRound (cbQuorumCertificate certBlock)) + ++ " certified block " + ++ show (qcBlock (cbQuorumCertificate certBlock)) onNewRound roundStatus %=! (rsCurrentRound .~ 1 + qcRound (cbQuorumCertificate certBlock)) diff --git a/concordium-consensus/src/Concordium/KonsensusV1/Consensus/Timeout.hs b/concordium-consensus/src/Concordium/KonsensusV1/Consensus/Timeout.hs index fa1c564d92..8cf558a654 100644 --- a/concordium-consensus/src/Concordium/KonsensusV1/Consensus/Timeout.hs +++ b/concordium-consensus/src/Concordium/KonsensusV1/Consensus/Timeout.hs @@ -113,7 +113,7 @@ receiveTimeoutMessage :: -- |Result of receiving the 'TimeoutMessage'. m (ReceiveTimeoutMessageResult (MPV m)) receiveTimeoutMessage tm@TimeoutMessage{tmBody = TimeoutMessageBody{..}} skovData - -- Consenus has been shutdown. + -- Consensus has been shutdown. | skovData ^. isConsensusShutdown = return ConsensusShutdown -- The round of the 'TimeoutMessage' is obsolete. | tmRound < currentRound =