From d6ccab1ddcf85e31f5bad15b61404dcb44ee41fb Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <a.shekhirin@gmail.com>
Date: Thu, 25 May 2023 18:21:21 +0400
Subject: [PATCH] chore: improve stage checkpoint logs (#2823)

---
 bin/reth/src/node/events.rs       | 26 +++++++++++++++++++++-----
 crates/stages/src/pipeline/mod.rs |  1 +
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/bin/reth/src/node/events.rs b/bin/reth/src/node/events.rs
index f9cf3528f5..bf57823823 100644
--- a/bin/reth/src/node/events.rs
+++ b/bin/reth/src/node/events.rs
@@ -43,18 +43,34 @@ impl NodeState {
                 self.current_checkpoint = checkpoint.unwrap_or_default();
 
                 if notable {
-                    info!(target: "reth::cli", stage = %stage_id, from = ?checkpoint, "Executing stage");
+                    info!(
+                        target: "reth::cli",
+                        stage = %stage_id,
+                        from = self.current_checkpoint.block_number,
+                        checkpoint = %self.current_checkpoint,
+                        "Executing stage",
+                    );
                 }
             }
             PipelineEvent::Ran { stage_id, result: ExecOutput { checkpoint, done } } => {
-                let notable = checkpoint.block_number > self.current_checkpoint.block_number;
                 self.current_checkpoint = checkpoint;
+
                 if done {
                     self.current_stage = None;
-                    info!(target: "reth::cli", stage = %stage_id, checkpoint = %checkpoint, "Stage finished executing");
-                } else if notable {
-                    info!(target: "reth::cli", stage = %stage_id, checkpoint = %checkpoint, "Stage committed progress");
                 }
+
+                info!(
+                    target: "reth::cli",
+                    stage = %stage_id,
+                    progress = checkpoint.block_number,
+                    %checkpoint,
+                    "{}",
+                    if done {
+                        "Stage finished executing"
+                    } else {
+                        "Stage committed progress"
+                    }
+                );
             }
             _ => (),
         }
diff --git a/crates/stages/src/pipeline/mod.rs b/crates/stages/src/pipeline/mod.rs
index 03ceca4bdc..ab2f9adb85 100644
--- a/crates/stages/src/pipeline/mod.rs
+++ b/crates/stages/src/pipeline/mod.rs
@@ -327,6 +327,7 @@ where
                     info!(
                         target: "sync::pipeline",
                         stage = %stage_id,
+                        progress = checkpoint.block_number,
                         %checkpoint,
                         %done,
                         "Stage made progress"