return previous checkpoint if pruner didn't finish

paradigmxyz · Jul 10, 2024 · 47669ba · 47669ba
1 parent 65730f3
commit 47669ba
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 36 deletions.
diff --git a/crates/stages/stages/src/stages/prune.rs b/crates/stages/stages/src/stages/prune.rs
@@ -1,5 +1,5 @@
 use reth_db_api::database::Database;
-use reth_provider::{DatabaseProviderRW, PruneCheckpointReader};
+use reth_provider::DatabaseProviderRW;
 use reth_prune::{PruneModes, PrunerBuilder};
 use reth_stages_api::{
     ExecInput, ExecOutput, Stage, StageCheckpoint, StageError, StageId, UnwindInput, UnwindOutput,
@@ -47,18 +47,11 @@ impl<DB: Database> Stage<DB> for PruneStage {
             .build();
 
         let result = pruner.run(provider, input.target())?;
-        let lowest_pruned_block = provider
-            .get_prune_checkpoints()?
-            .into_iter()
-            .map(|(_, checkpoint)| checkpoint.block_number)
-            .min()
-            .flatten()
-            .unwrap_or_else(|| input.target());
-
-        Ok(ExecOutput {
-            checkpoint: StageCheckpoint::new(lowest_pruned_block),
-            done: result.is_finished(),
-        })
+        if result.is_finished() {
+            Ok(ExecOutput { checkpoint: StageCheckpoint::new(input.target()), done: true })
+        } else {
+            Ok(ExecOutput { checkpoint: input.checkpoint(), done: false })
+        }
     }
 
     fn unwind(

diff --git a/crates/storage/provider/src/providers/database/mod.rs b/crates/storage/provider/src/providers/database/mod.rs
@@ -582,10 +582,6 @@ impl<DB: Database> PruneCheckpointReader for ProviderFactory<DB> {
     ) -> ProviderResult<Option<PruneCheckpoint>> {
         self.provider()?.get_prune_checkpoint(segment)
     }
-
-    fn get_prune_checkpoints(&self) -> ProviderResult<Vec<(PruneSegment, PruneCheckpoint)>> {
-        self.provider()?.get_prune_checkpoints()
-    }
 }
 
 impl<DB> Clone for ProviderFactory<DB> {

diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs
@@ -2822,14 +2822,6 @@ impl<TX: DbTx> PruneCheckpointReader for DatabaseProvider<TX> {
     ) -> ProviderResult<Option<PruneCheckpoint>> {
         Ok(self.tx.get::<tables::PruneCheckpoints>(segment)?)
     }
-
-    fn get_prune_checkpoints(&self) -> ProviderResult<Vec<(PruneSegment, PruneCheckpoint)>> {
-        Ok(self
-            .tx
-            .cursor_read::<tables::PruneCheckpoints>()?
-            .walk(None)?
-            .collect::<Result<Vec<_>, _>>()?)
-    }
 }
 
 impl<TX: DbTxMut> PruneCheckpointWriter for DatabaseProvider<TX> {

diff --git a/crates/storage/provider/src/providers/mod.rs b/crates/storage/provider/src/providers/mod.rs
@@ -581,10 +581,6 @@ where
     ) -> ProviderResult<Option<PruneCheckpoint>> {
         self.database.provider()?.get_prune_checkpoint(segment)
     }
-
-    fn get_prune_checkpoints(&self) -> ProviderResult<Vec<(PruneSegment, PruneCheckpoint)>> {
-        self.database.provider()?.get_prune_checkpoints()
-    }
 }
 
 impl<DB> ChainSpecProvider for BlockchainProvider<DB>

diff --git a/crates/storage/provider/src/test_utils/noop.rs b/crates/storage/provider/src/test_utils/noop.rs
@@ -477,10 +477,6 @@ impl PruneCheckpointReader for NoopProvider {
     ) -> ProviderResult<Option<PruneCheckpoint>> {
         Ok(None)
     }
-
-    fn get_prune_checkpoints(&self) -> ProviderResult<Vec<(PruneSegment, PruneCheckpoint)>> {
-        Ok(vec![])
-    }
 }
 
 impl StaticFileProviderFactory for NoopProvider {

diff --git a/crates/storage/storage-api/src/prune_checkpoint.rs b/crates/storage/storage-api/src/prune_checkpoint.rs
@@ -9,9 +9,6 @@ pub trait PruneCheckpointReader: Send + Sync {
         &self,
         segment: PruneSegment,
     ) -> ProviderResult<Option<PruneCheckpoint>>;
-
-    /// Fetch the checkpoints for all prune segments.
-    fn get_prune_checkpoints(&self) -> ProviderResult<Vec<(PruneSegment, PruneCheckpoint)>>;
 }
 
 /// The trait for updating prune checkpoint related data.