Skip to content
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.

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

refactor(prune): impl Segment for other prune segments #4899

Merged
merged 35 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cfaecda
feat(pruner): shared deletion limit
shekhirin Oct 2, 2023
1ab58ae
fix clippy
shekhirin Oct 2, 2023
993a772
use mainnet prune default limit
shekhirin Oct 3, 2023
29f8768
refactor(prune): part trait, receipts impl
shekhirin Oct 3, 2023
9d0e897
std::result::Result -> Result
shekhirin Oct 3, 2023
7b2c7dc
reorg modules, add comments
shekhirin Oct 3, 2023
16a7cc6
remove prune_mode from input
shekhirin Oct 3, 2023
b257d39
fixes after review
shekhirin Oct 3, 2023
6d2455f
Merge remote-tracking branch 'origin/alexey/pruner-deletion-limit' in…
shekhirin Oct 3, 2023
3356ddf
fixes after review
shekhirin Oct 3, 2023
b6c0a1c
Merge remote-tracking branch 'origin/alexey/pruner-deletion-limit' in…
shekhirin Oct 3, 2023
9033001
fixes after review
shekhirin Oct 3, 2023
5b9c420
part -> segment
shekhirin Oct 3, 2023
61b9b9c
empty struct
shekhirin Oct 3, 2023
c34a86f
fix config deser test
shekhirin Oct 3, 2023
0f89ed5
fix sender recovery distance in config compatibility test
shekhirin Oct 3, 2023
0db55e4
impl Segment for other segments
shekhirin Oct 3, 2023
2fa00e3
ReceiptsByLogs segment
shekhirin Oct 3, 2023
92248db
fix docs
shekhirin Oct 4, 2023
1345d16
rename receipts by logs segment method
shekhirin Oct 4, 2023
868f212
check deletion limit early
shekhirin Oct 4, 2023
2cad1c0
check delete limit, div ceil delete limit for history pruning
shekhirin Oct 4, 2023
18038b8
improve delete_limit docs
shekhirin Oct 4, 2023
aca3c78
Merge remote-tracking branch 'origin/alexey/pruner-deletion-limit' in…
shekhirin Oct 5, 2023
f45d39e
Merge remote-tracking branch 'origin/main' into alexey/pruner-part-trait
shekhirin Oct 5, 2023
7872ce4
leftover parts
shekhirin Oct 5, 2023
d78e03c
fix merge
shekhirin Oct 5, 2023
a881a65
Merge remote-tracking branch 'origin/alexey/pruner-part-trait' into a…
shekhirin Oct 5, 2023
8d89800
Merge remote-tracking branch 'origin/main' into alexey/pruner-part-tr…
shekhirin Oct 5, 2023
3651bef
check delete limit in receipts log filter
shekhirin Oct 5, 2023
270ae7d
remove previous_checkpoint todo
shekhirin Oct 5, 2023
410d2e7
introduce helper type
shekhirin Oct 5, 2023
b1d0d2b
Merge remote-tracking branch 'origin/main' into alexey/pruner-part-tr…
shekhirin Oct 9, 2023
0552157
Merge remote-tracking branch 'origin/main' into alexey/pruner-part-tr…
shekhirin Oct 9, 2023
d7fa9a5
Merge remote-tracking branch 'origin/main' into alexey/pruner-part-tr…
shekhirin Oct 11, 2023
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
4 changes: 2 additions & 2 deletions bin/reth/src/node/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ impl NodeState {

fn handle_pruner_event(&self, event: PrunerEvent) {
match event {
PrunerEvent::Finished { tip_block_number, elapsed, segments } => {
info!(tip_block_number, ?elapsed, ?segments, "Pruner finished");
PrunerEvent::Finished { tip_block_number, elapsed, stats } => {
info!(tip_block_number, ?elapsed, ?stats, "Pruner finished");
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions crates/primitives/src/prune/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,4 @@ impl PruneProgress {
Self::HasMoreData
}
}

/// Returns `true` if pruning has been finished.
pub fn is_finished(&self) -> bool {
matches!(self, Self::Finished)
}
}
2 changes: 1 addition & 1 deletion crates/prune/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ pub enum PrunerEvent {
Finished {
tip_block_number: BlockNumber,
elapsed: Duration,
segments: BTreeMap<PruneSegment, (PruneProgress, usize)>,
stats: BTreeMap<PruneSegment, (PruneProgress, usize)>,
},
}
Loading
Loading