Skip to content

fix(storage): avoid panic when pruning headers without static files #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mukminn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(storage): avoid panic when pruning headers without static files #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions crates/storage/provider/src/providers/database/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2918,21 +2918,24 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypesForProvider + 'static> BlockWrite
self.tx.delete::<tables::HeaderNumbers>(hash, None)?;
}

// Get highest static file block for the total block range
let highest_static_file_block = self
.static_file_provider()
.get_highest_static_file_block(StaticFileSegment::Headers)
.expect("todo: error handling, headers should exist");

// IMPORTANT: we use `highest_static_file_block.saturating_sub(block_number)` to make sure
// we remove only what is ABOVE the block.
// Get highest static file block for the total block range.
//
// i.e., if the highest static file block is 8, we want to remove above block 5 only, we
// will have three blocks to remove, which will be block 8, 7, and 6.
debug!(target: "providers::db", ?block, "Removing static file blocks above block_number");
self.static_file_provider()
.get_writer(block, StaticFileSegment::Headers)?
.prune_headers(highest_static_file_block.saturating_sub(block))?;
// If there are no header static files yet, there is nothing to prune.
if let Some(highest_static_file_block) =
self.static_file_provider().get_highest_static_file_block(StaticFileSegment::Headers)
{
// IMPORTANT: we use `highest_static_file_block.saturating_sub(block_number)` to make sure
// we remove only what is ABOVE the block.
//
// i.e., if the highest static file block is 8, we want to remove above block 5 only, we
// will have three blocks to remove, which will be block 8, 7, and 6.
debug!(target: "providers::db", ?block, "Removing static file blocks above block_number");
self.static_file_provider()
.get_writer(block, StaticFileSegment::Headers)?
.prune_headers(highest_static_file_block.saturating_sub(block))?;
} else {
debug!(target: "providers::db", ?block, "No header static files found; skipping static file pruning");
}

// First transaction to be removed
let unwind_tx_from = self
Expand Down Expand Up @@ -3164,6 +3167,15 @@ mod tests {
};
use reth_testing_utils::generators::{self, random_block, BlockParams};

#[test]
fn test_remove_blocks_above_without_static_file_headers() {
let factory = create_test_provider_factory();
let provider_rw = factory.provider_rw().unwrap();

// There are no static files yet in a fresh test provider. This should not panic.
assert!(provider_rw.remove_blocks_above(0).is_ok());
}

#[test]
fn test_receipts_by_block_range_empty_range() {
let factory = create_test_provider_factory();
Expand Down