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.

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

Jump to bottom

feat(engine): require VALID latest FCU status before pruning #3954

Merged
merged 5 commits into from
Aug 2, 2023
Merged

feat(engine): require VALID latest FCU status before pruning #3954

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1265547
feat(engine): require at least one FCU before pruning
shekhirin Jul 27, 2023
0ad8670
Merge remote-tracking branch 'origin/main' into alexey/pruner-engine-…
shekhirin Jul 31, 2023
454d918
change clause to be 'Latest FCU status is VALID'
shekhirin Jul 31, 2023
d3f6cc8
Merge remote-tracking branch 'origin/main' into alexey/pruner-engine-…
shekhirin Aug 2, 2023
3dc5093
use helper
shekhirin Aug 2, 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
16 changes: 12 additions & 4 deletions crates/consensus/beacon/src/engine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,10 +1710,18 @@ where
// we're pending if both engine messages and sync events are pending (fully drained)
let is_pending = engine_messages_pending && sync_pending;

// check prune events if pipeline is idle AND (pruning is running and we need to
// prioritize checking its events OR no engine and sync messages are pending and we may
// start pruning)
if this.sync.is_pipeline_idle() && (this.is_prune_active() || is_pending) {
// Poll prune controller if all conditions are met:
// 1. Pipeline is idle
// 2. Pruning is running and we need to prioritize checking its events OR no engine and
// sync messages are pending and we may start pruning
// 3. Latest FCU status is VALID
if this.sync.is_pipeline_idle() &&
(this.is_prune_active() || is_pending) &&
this.forkchoice_state_tracker
.latest_status()
.map(|status| status.is_valid())
.unwrap_or_default()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes

there is .is_latest_valid() already, we can now remove the unused attr there

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops TIL, fixed

{
if let Some(ref mut prune) = this.prune {
match prune.poll(cx, this.blockchain.canonical_tip().number) {
Poll::Ready(prune_event) => {
Expand Down
Loading