From c0734dafffef8396126c0d7cf798e9c9699db158 Mon Sep 17 00:00:00 2001 From: sergerad Date: Sun, 12 Jan 2025 21:17:12 +1300 Subject: [PATCH 1/3] Move temporary error logs to debug instead of warn --- crates/derive/src/pipeline/core.rs | 4 ++++ crates/driver/src/pipeline.rs | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs index afcad816..e82ff9d8 100644 --- a/crates/derive/src/pipeline/core.rs +++ b/crates/derive/src/pipeline/core.rs @@ -176,6 +176,10 @@ where } StepResult::AdvancedOrigin } + PipelineErrorKind::Temporary(_) => { + debug!(target: "pipeline", "Attributes queue step failed temporarily: {:?}", err); + StepResult::StepFailed(err) + } _ => { warn!(target: "pipeline", "Attributes queue step failed: {:?}", err); StepResult::StepFailed(err) diff --git a/crates/driver/src/pipeline.rs b/crates/driver/src/pipeline.rs index a7785c60..3b76153c 100644 --- a/crates/driver/src/pipeline.rs +++ b/crates/driver/src/pipeline.rs @@ -40,14 +40,16 @@ where info!(target: "client_derivation_driver", "Advanced origin") } StepResult::OriginAdvanceErr(e) | StepResult::StepFailed(e) => { - warn!(target: "client_derivation_driver", "Failed to step derivation pipeline: {:?}", e); - // Break the loop unless the error signifies that there is not enough data to // complete the current step. In this case, we retry the step to see if other // stages can make progress. match e { - PipelineErrorKind::Temporary(_) => continue, + PipelineErrorKind::Temporary(_) => { + debug!(target: "client_derivation_driver", "Failed to step derivation pipeline temporarily: {:?}", e); + continue + } PipelineErrorKind::Reset(e) => { + warn!(target: "client_derivation_driver", "Failed to step derivation pipeline due to reset: {:?}", e); let system_config = self .system_config_by_number(l2_safe_head.block_info.number) .await?; @@ -85,7 +87,10 @@ where .await?; } } - PipelineErrorKind::Critical(_) => return Err(e), + PipelineErrorKind::Critical(_) => { + warn!(target: "client_derivation_driver", "Failed to step derivation pipeline: {:?}", e); + return Err(e) + } } } } From 9a01fd074dc0fb2c3f2fe68e5afceebe604bbe04 Mon Sep 17 00:00:00 2001 From: sergerad Date: Mon, 13 Jan 2025 08:40:36 +1300 Subject: [PATCH 2/3] Use trace --- crates/derive/src/pipeline/core.rs | 2 +- crates/driver/src/pipeline.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs index e82ff9d8..93b1b3f0 100644 --- a/crates/derive/src/pipeline/core.rs +++ b/crates/derive/src/pipeline/core.rs @@ -177,7 +177,7 @@ where StepResult::AdvancedOrigin } PipelineErrorKind::Temporary(_) => { - debug!(target: "pipeline", "Attributes queue step failed temporarily: {:?}", err); + trace!(target: "pipeline", "Attributes queue step failed temporarily: {:?}", err); StepResult::StepFailed(err) } _ => { diff --git a/crates/driver/src/pipeline.rs b/crates/driver/src/pipeline.rs index 3b76153c..dc941e4c 100644 --- a/crates/driver/src/pipeline.rs +++ b/crates/driver/src/pipeline.rs @@ -45,7 +45,7 @@ where // stages can make progress. match e { PipelineErrorKind::Temporary(_) => { - debug!(target: "client_derivation_driver", "Failed to step derivation pipeline temporarily: {:?}", e); + trace!(target: "client_derivation_driver", "Failed to step derivation pipeline temporarily: {:?}", e); continue } PipelineErrorKind::Reset(e) => { From 9c477d5ca6b3c7b8bd536f8e83ecd57e50ddac49 Mon Sep 17 00:00:00 2001 From: sergerad Date: Mon, 13 Jan 2025 08:58:14 +1300 Subject: [PATCH 3/3] Reword log line --- crates/derive/src/pipeline/core.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs index 93b1b3f0..6b3ddda1 100644 --- a/crates/derive/src/pipeline/core.rs +++ b/crates/derive/src/pipeline/core.rs @@ -177,7 +177,7 @@ where StepResult::AdvancedOrigin } PipelineErrorKind::Temporary(_) => { - trace!(target: "pipeline", "Attributes queue step failed temporarily: {:?}", err); + trace!(target: "pipeline", "Attributes queue step failed due to temporary error: {:?}", err); StepResult::StepFailed(err) } _ => {