CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shuffled log levels (#813)

Browse Source 
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Trent Mohay 6 years ago committed by GitHub
parent 66d847a6b2
commit ba9b648dc8
5 changed files with 32 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinator.java
  2. 25
      consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java
  3. 9
      consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftController.java
  4. 18
      consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRound.java
  5. 2
      consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/NewRoundMessageValidator.java

2
consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/blockcreation/IbftMiningCoordinator.java
Unescape View File

@ -78,7 +78,7 @@ public class IbftMiningCoordinator implements MiningCoordinator, BlockAddedObser
@Override @Override
public void onBlockAdded(final BlockAddedEvent event, final Blockchain blockchain) { public void onBlockAdded(final BlockAddedEvent event, final Blockchain blockchain) {
if (event.isNewCanonicalHead()) { if (event.isNewCanonicalHead()) {
LOG.info("New canonical head detected"); LOG.trace("New canonical head detected");
eventQueue.add(new NewChainHead(event.getBlock().getHeader())); eventQueue.add(new NewChainHead(event.getBlock().getHeader()));
} }
} }

25
consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java
Unescape View File

@ -113,7 +113,7 @@ public class IbftBlockHeightManager implements BlockHeightManager {
if (roundIdentifier.equals(currentRound.getRoundIdentifier())) { if (roundIdentifier.equals(currentRound.getRoundIdentifier())) {
currentRound.createAndSendProposalMessage(clock.millis() / 1000); currentRound.createAndSendProposalMessage(clock.millis() / 1000);
} else { } else {
LOG.info( LOG.trace(
"Block timer expired for a round ({}) other than current ({})", "Block timer expired for a round ({}) other than current ({})",
roundIdentifier, roundIdentifier,
currentRound.getRoundIdentifier()); currentRound.getRoundIdentifier());
@ -123,14 +123,14 @@ public class IbftBlockHeightManager implements BlockHeightManager {
@Override @Override
public void roundExpired(final RoundExpiry expire) { public void roundExpired(final RoundExpiry expire) {
if (!expire.getView().equals(currentRound.getRoundIdentifier())) { if (!expire.getView().equals(currentRound.getRoundIdentifier())) {
LOG.info( LOG.trace(
"Ignoring Round timer expired which does not match current round. round={}, timerRound={}", "Ignoring Round timer expired which does not match current round. round={}, timerRound={}",
currentRound.getRoundIdentifier(), currentRound.getRoundIdentifier(),
expire.getView()); expire.getView());
return; return;
} }
LOG.info( LOG.debug(
"Round has expired, creating PreparedCertificate and notifying peers. round={}", "Round has expired, creating PreparedCertificate and notifying peers. round={}",
currentRound.getRoundIdentifier()); currentRound.getRoundIdentifier());
final Optional<PreparedRoundArtifacts> preparedRoundArtifacts = final Optional<PreparedRoundArtifacts> preparedRoundArtifacts =
@ -155,21 +155,21 @@ public class IbftBlockHeightManager implements BlockHeightManager {
@Override @Override
public void handleProposalPayload(final Proposal proposal) { public void handleProposalPayload(final Proposal proposal) {
LOG.debug("Received a Proposal Payload."); LOG.trace("Received a Proposal Payload.");
actionOrBufferMessage( actionOrBufferMessage(
proposal, currentRound::handleProposalMessage, RoundState::setProposedBlock); proposal, currentRound::handleProposalMessage, RoundState::setProposedBlock);
} }
@Override @Override
public void handlePreparePayload(final Prepare prepare) { public void handlePreparePayload(final Prepare prepare) {
LOG.debug("Received a Prepare Payload."); LOG.trace("Received a Prepare Payload.");
actionOrBufferMessage( actionOrBufferMessage(
prepare, currentRound::handlePrepareMessage, RoundState::addPrepareMessage); prepare, currentRound::handlePrepareMessage, RoundState::addPrepareMessage);
} }
@Override @Override
public void handleCommitPayload(final Commit commit) { public void handleCommitPayload(final Commit commit) {
LOG.debug("Received a Commit Payload."); LOG.trace("Received a Commit Payload.");
actionOrBufferMessage(commit, currentRound::handleCommitMessage, RoundState::addCommitMessage); actionOrBufferMessage(commit, currentRound::handleCommitMessage, RoundState::addCommitMessage);
} }
@ -193,18 +193,21 @@ public class IbftBlockHeightManager implements BlockHeightManager {
@Override @Override
public void handleRoundChangePayload(final RoundChange message) { public void handleRoundChangePayload(final RoundChange message) {
final ConsensusRoundIdentifier targetRound = message.getRoundIdentifier(); final ConsensusRoundIdentifier targetRound = message.getRoundIdentifier();
LOG.info("Received a RoundChange Payload for {}", targetRound.toString()); LOG.trace("Received a RoundChange Payload for {}", targetRound);
final MessageAge messageAge = final MessageAge messageAge =
determineAgeOfPayload(message.getRoundIdentifier().getRoundNumber()); determineAgeOfPayload(message.getRoundIdentifier().getRoundNumber());
if (messageAge == PRIOR_ROUND) { if (messageAge == PRIOR_ROUND) {
LOG.debug("Received RoundChange Payload for a prior round. targetRound={}", targetRound); LOG.trace("Received RoundChange Payload for a prior round. targetRound={}", targetRound);
return; return;
} }
final Optional<Collection<RoundChange>> result = final Optional<Collection<RoundChange>> result =
roundChangeManager.appendRoundChangeMessage(message); roundChangeManager.appendRoundChangeMessage(message);
if (result.isPresent()) { if (result.isPresent()) {
LOG.debug(
"Received sufficient RoundChange messages to change round to targetRound={}",
targetRound);
if (messageAge == FUTURE_ROUND) { if (messageAge == FUTURE_ROUND) {
startNewRound(targetRound.getRoundNumber()); startNewRound(targetRound.getRoundNumber());
} }
@ -219,7 +222,7 @@ public class IbftBlockHeightManager implements BlockHeightManager {
} }
private void startNewRound(final int roundNumber) { private void startNewRound(final int roundNumber) {
LOG.info("Starting new round {}", roundNumber); LOG.debug("Starting new round {}", roundNumber);
if (futureRoundStateBuffer.containsKey(roundNumber)) { if (futureRoundStateBuffer.containsKey(roundNumber)) {
currentRound = currentRound =
roundFactory.createNewRoundWithState( roundFactory.createNewRoundWithState(
@ -240,10 +243,10 @@ public class IbftBlockHeightManager implements BlockHeightManager {
determineAgeOfPayload(newRound.getRoundIdentifier().getRoundNumber()); determineAgeOfPayload(newRound.getRoundIdentifier().getRoundNumber());
if (messageAge == PRIOR_ROUND) { if (messageAge == PRIOR_ROUND) {
LOG.info("Received NewRound Payload for a prior round={}", newRound.getRoundIdentifier()); LOG.trace("Received NewRound Payload for a prior round={}", newRound.getRoundIdentifier());
return; return;
} }
LOG.info("Received NewRound Payload for {}", newRound.getRoundIdentifier()); LOG.trace("Received NewRound Payload for {}", newRound.getRoundIdentifier());
if (newRoundMessageValidator.validateNewRoundMessage(newRound)) { if (newRoundMessageValidator.validateNewRoundMessage(newRound)) {
if (messageAge == FUTURE_ROUND) { if (messageAge == FUTURE_ROUND) {

9
consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftController.java
Unescape View File

@ -158,8 +158,9 @@ public class IbftController {
public void handleNewBlockEvent(final NewChainHead newChainHead) { public void handleNewBlockEvent(final NewChainHead newChainHead) {
final BlockHeader newBlockHeader = newChainHead.getNewChainHeadHeader(); final BlockHeader newBlockHeader = newChainHead.getNewChainHeadHeader();
final BlockHeader currentMiningParent = currentHeightManager.getParentBlockHeader(); final BlockHeader currentMiningParent = currentHeightManager.getParentBlockHeader();
LOG.debug("Handling New Chain head event, chain height = {}", currentMiningParent.getNumber());
if (newBlockHeader.getNumber() < currentMiningParent.getNumber()) { if (newBlockHeader.getNumber() < currentMiningParent.getNumber()) {
LOG.debug( LOG.trace(
"Discarding NewChainHead event, was for previous block height. chainHeight={} eventHeight={}", "Discarding NewChainHead event, was for previous block height. chainHeight={} eventHeight={}",
currentMiningParent.getNumber(), currentMiningParent.getNumber(),
newBlockHeader.getNumber()); newBlockHeader.getNumber());
@ -168,7 +169,7 @@ public class IbftController {
if (newBlockHeader.getNumber() == currentMiningParent.getNumber()) { if (newBlockHeader.getNumber() == currentMiningParent.getNumber()) {
if (newBlockHeader.getHash().equals(currentMiningParent.getHash())) { if (newBlockHeader.getHash().equals(currentMiningParent.getHash())) {
LOG.debug( LOG.trace(
"Discarding duplicate NewChainHead event. chainHeight={} newBlockHash={} parentBlockHash", "Discarding duplicate NewChainHead event. chainHeight={} newBlockHash={} parentBlockHash",
newBlockHeader.getNumber(), newBlockHeader.getNumber(),
newBlockHeader.getHash(), newBlockHeader.getHash(),
@ -188,7 +189,7 @@ public class IbftController {
if (isMsgForCurrentHeight(roundIndentifier)) { if (isMsgForCurrentHeight(roundIndentifier)) {
currentHeightManager.handleBlockTimerExpiry(roundIndentifier); currentHeightManager.handleBlockTimerExpiry(roundIndentifier);
} else { } else {
LOG.debug( LOG.trace(
"Block timer event discarded as it is not for current block height chainHeight={} eventHeight={}", "Block timer event discarded as it is not for current block height chainHeight={} eventHeight={}",
currentHeightManager.getChainHeight(), currentHeightManager.getChainHeight(),
roundIndentifier.getSequenceNumber()); roundIndentifier.getSequenceNumber());
@ -199,7 +200,7 @@ public class IbftController {
if (isMsgForCurrentHeight(roundExpiry.getView())) { if (isMsgForCurrentHeight(roundExpiry.getView())) {
currentHeightManager.roundExpired(roundExpiry); currentHeightManager.roundExpired(roundExpiry);
} else { } else {
LOG.debug( LOG.trace(
"Round expiry event discarded as it is not for current block height chainHeight={} eventHeight={}", "Round expiry event discarded as it is not for current block height chainHeight={} eventHeight={}",
currentHeightManager.getChainHeight(), currentHeightManager.getChainHeight(),
roundExpiry.getView().getSequenceNumber()); roundExpiry.getView().getSequenceNumber());

18
consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftRound.java
Unescape View File

@ -81,7 +81,7 @@ public class IbftRound {
public void createAndSendProposalMessage(final long headerTimeStampSeconds) { public void createAndSendProposalMessage(final long headerTimeStampSeconds) {
final Block block = blockCreator.createBlock(headerTimeStampSeconds); final Block block = blockCreator.createBlock(headerTimeStampSeconds);
final IbftExtraData extraData = IbftExtraData.decode(block.getHeader().getExtraData()); final IbftExtraData extraData = IbftExtraData.decode(block.getHeader().getExtraData());
LOG.info( LOG.debug(
"Creating proposed block. round={} extraData={} blockHeader={}", "Creating proposed block. round={} extraData={} blockHeader={}",
roundState.getRoundIdentifier(), roundState.getRoundIdentifier(),
extraData, extraData,
@ -98,11 +98,11 @@ public class IbftRound {
Proposal proposal; Proposal proposal;
if (!bestBlockFromRoundChange.isPresent()) { if (!bestBlockFromRoundChange.isPresent()) {
LOG.trace("Multicasting NewRound with new block. round={}", roundState.getRoundIdentifier()); LOG.debug("Multicasting NewRound with new block. round={}", roundState.getRoundIdentifier());
final Block block = blockCreator.createBlock(headerTimestamp); final Block block = blockCreator.createBlock(headerTimestamp);
proposal = messageFactory.createProposal(getRoundIdentifier(), block); proposal = messageFactory.createProposal(getRoundIdentifier(), block);
} else { } else {
LOG.trace( LOG.debug(
"Multicasting NewRound from PreparedCertificate. round={}", "Multicasting NewRound from PreparedCertificate. round={}",
roundState.getRoundIdentifier()); roundState.getRoundIdentifier());
proposal = createProposalAroundBlock(bestBlockFromRoundChange.get()); proposal = createProposalAroundBlock(bestBlockFromRoundChange.get());
@ -125,7 +125,7 @@ public class IbftRound {
} }
public void handleProposalMessage(final Proposal msg) { public void handleProposalMessage(final Proposal msg) {
LOG.info("Handling a Proposal message."); LOG.debug("Handling a Proposal message.");
if (getRoundIdentifier().getRoundNumber() != 0) { if (getRoundIdentifier().getRoundNumber() != 0) {
LOG.error("Illegally received a Proposal message when not in Round 0."); LOG.error("Illegally received a Proposal message when not in Round 0.");
@ -135,7 +135,7 @@ public class IbftRound {
} }
public void handleProposalFromNewRound(final NewRound msg) { public void handleProposalFromNewRound(final NewRound msg) {
LOG.info("Handling a New Round Proposal."); LOG.debug("Handling a New Round Proposal.");
if (getRoundIdentifier().getRoundNumber() == 0) { if (getRoundIdentifier().getRoundNumber() == 0) {
LOG.error("Illegally received a NewRound message when in Round 0."); LOG.error("Illegally received a NewRound message when in Round 0.");
@ -148,7 +148,7 @@ public class IbftRound {
final Block block = msg.getBlock(); final Block block = msg.getBlock();
if (updateStateWithProposedBlock(msg)) { if (updateStateWithProposedBlock(msg)) {
LOG.info("Sending prepare message."); LOG.debug("Sending prepare message.");
transmitter.multicastPrepare(getRoundIdentifier(), block.getHash()); transmitter.multicastPrepare(getRoundIdentifier(), block.getHash());
final Prepare localPrepareMessage = final Prepare localPrepareMessage =
messageFactory.createPrepare(roundState.getRoundIdentifier(), block.getHash()); messageFactory.createPrepare(roundState.getRoundIdentifier(), block.getHash());
@ -221,7 +221,11 @@ public class IbftRound {
final long blockNumber = blockToImport.getHeader().getNumber(); final long blockNumber = blockToImport.getHeader().getNumber();
final IbftExtraData extraData = IbftExtraData.decode(blockToImport.getHeader().getExtraData()); final IbftExtraData extraData = IbftExtraData.decode(blockToImport.getHeader().getExtraData());
LOG.info("Importing block to chain. block={} extraData={}", blockNumber, extraData); LOG.info(
"Importing block to chain. round={}, hash={}",
getRoundIdentifier(),
blockToImport.getHash());
LOG.debug("ExtraData = {}", extraData);
final boolean result = final boolean result =
blockImporter.importBlock(protocolContext, blockToImport, HeaderValidationMode.FULL); blockImporter.importBlock(protocolContext, blockToImport, HeaderValidationMode.FULL);
if (!result) { if (!result) {

2
consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/NewRoundMessageValidator.java
Unescape View File

@ -100,7 +100,7 @@ public class NewRoundMessageValidator {
findLatestPreparedCertificate(roundChangePayloads); findLatestPreparedCertificate(roundChangePayloads);
if (!latestPreparedCertificate.isPresent()) { if (!latestPreparedCertificate.isPresent()) {
LOG.info( LOG.trace(
"No round change messages have a preparedCertificate, any valid block may be proposed."); "No round change messages have a preparedCertificate, any valid block may be proposed.");
return true; return true;
} }

Write Preview
Loading…
Cancel
Save