Skip to content

Add write lock for remove-pre-exec-block #15

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

Draft
wants to merge 1 commit into
base: unstable
Choose a base branch
from
Draft

Add write lock for remove-pre-exec-block #15

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
14 changes: 11 additions & 3 deletions beacon_node/beacon_chain/src/data_availability_checker/overflow_lru_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,9 +725,17 @@ impl<T: BeaconChainTypes> DataAvailabilityCheckerInner<T> {
/// Removes a pre-execution block from the cache.
/// This does NOT remove an existing executed block.
pub fn remove_pre_execution_block(&self, block_root: &Hash256) {
// The read lock is immediately dropped so we can safely remove the block from the cache.
if let Some(BlockProcessStatus::NotValidated(_, _)) = self.get_cached_block(block_root) {
self.critical.write().pop(block_root);
// Conservatively, hold a write lock ensuring that the pre-executed
// block cannot be upgraded to
let mut write_lock = self.critical.write();

let should_remove = write_lock
.peek(block_root)
.and_then(|components| components.block.as_ref())
.is_some_and(|cached_block| matches!(cached_block, CachedBlock::PreExecution(..)));

if should_remove {
write_lock.pop(block_root);
}
}

Expand Down
Loading