Improved QBFT logs (hyperledger#2996)

Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
yudongpo · Nov 4, 2021 · cb27f33 · cb27f33
1 parent c8f2c99
commit cb27f33
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...c/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBftController.java b/...c/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBftController.java
@@ -90,7 +90,10 @@ protected <P extends BftMessage<?>> void consumeMessage(
     // the currentHeightManager, but CAN be the same directly following import).
     if (bftMessage.getRoundIdentifier().getSequenceNumber()
         <= blockchain.getChainHeadBlockNumber()) {
-      LOG.debug("Discarding a message which targets a height not above current chain height.");
+      LOG.debug(
+          "Discarding a message which targets a height {} not above current chain height {}.",
+          bftMessage.getRoundIdentifier().getSequenceNumber(),
+          blockchain.getChainHeadBlockNumber());
       return;
     }
 

diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java
@@ -146,7 +146,10 @@ protected void updateStateWithProposalAndTransmit(
   }
 
   public void handleProposalMessage(final Proposal msg) {
-    LOG.debug("Received a proposal message. round={}", roundState.getRoundIdentifier());
+    LOG.debug(
+        "Received a proposal message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
     final Block block = msg.getSignedPayload().getPayload().getProposedBlock();
     if (updateStateWithProposedBlock(msg)) {
       sendPrepare(block);
@@ -167,12 +170,18 @@ private void sendPrepare(final Block block) {
   }
 
   public void handlePrepareMessage(final Prepare msg) {
-    LOG.debug("Received a prepare message. round={}", roundState.getRoundIdentifier());
+    LOG.debug(
+        "Received a prepare message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
     peerIsPrepared(msg);
   }
 
   public void handleCommitMessage(final Commit msg) {
-    LOG.debug("Received a commit message. round={}", roundState.getRoundIdentifier());
+    LOG.debug(
+        "Received a commit message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
     peerIsCommitted(msg);
   }
 
@@ -260,15 +269,15 @@ private void importBlockToChain() {
     final BftExtraData extraData = bftExtraDataCodec.decode(blockToImport.getHeader());
     LOG.log(
         getRoundIdentifier().getRoundNumber() > 0 ? Level.INFO : Level.DEBUG,
-        "Importing block to chain. round={}, hash={}",
+        "Importing proposed block to chain. round={}, hash={}",
         getRoundIdentifier(),
         blockToImport.getHash());
-    LOG.trace("Importing block with extraData={}", extraData);
+    LOG.trace("Importing proposed block with extraData={}", extraData);
     final boolean result =
         blockImporter.importBlock(protocolContext, blockToImport, HeaderValidationMode.FULL);
     if (!result) {
       LOG.error(
-          "Failed to import block to chain. block={} extraData={} blockHeader={}",
+          "Failed to import proposed block to chain. block={} extraData={} blockHeader={}",
           blockNumber,
           extraData,
           blockToImport.getHeader());