log execution errors at right level, stops transition message propagation post-merge sync. (#4104)

Signed-off-by: Justin Florentine <justin+github@florentine.us>

Co-authored-by: garyschulte <garyschulte@gmail.com>
pull/4107/head
Justin Florentine 2 years ago committed by GitHub
parent 94e6541ca1
commit 0d1d36afc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java
  2. 2
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecutionEngineJsonRpcMethod.java
  3. 3
      ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java

@ -84,7 +84,7 @@ public class PostMergeContext implements MergeContext {
@Override @Override
public void setIsPostMerge(final Difficulty totalDifficulty) { public void setIsPostMerge(final Difficulty totalDifficulty) {
if (isPostMerge.get().orElse(Boolean.FALSE) && lastFinalized.get() != null) { if (isPostMerge.get().orElse(Boolean.FALSE)) {
// if we have finalized, we never switch back to a pre-merge once we have transitioned // if we have finalized, we never switch back to a pre-merge once we have transitioned
// post-TTD. // post-TTD.
return; return;

@ -66,7 +66,7 @@ public abstract class ExecutionEngineJsonRpcMethod implements JsonRpcMethod {
cf.complete( cf.complete(
resp.otherwise( resp.otherwise(
t -> { t -> {
LOG.debug( LOG.error(
String.format("failed to exec consensus method %s", this.getName()), String.format("failed to exec consensus method %s", this.getName()),
t); t);
return new JsonRpcErrorResponse( return new JsonRpcErrorResponse(

@ -511,7 +511,8 @@ public class BlockPropagationManager {
} }
private void reactToTTDReachedEvent(final boolean ttdReached) { private void reactToTTDReachedEvent(final boolean ttdReached) {
if (ttdReached) { if (started.get() && ttdReached) {
LOG.info("Block propagation was running, then ttd reached, stopping");
stop(); stop();
} else if (!started.get()) { } else if (!started.get()) {
start(); start();

Loading…
Cancel
Save