cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Reuse fork choice read lock instead of re-acquiring it immediately (#4688)

Browse Source 
## Issue Addressed

I went through the code base and look for places where we acquire fork choice locks (after the deadlock bug was found and fixed in #4687), and discovered an instance where we re-acquire a lock immediately after dropping it. This shouldn't cause deadlock like the other issue, but is slightly less efficient.
This commit is contained in:
Jimmy Chen 2023-09-21 00:26:52 +00:00
parent 4b6cb3db2c
commit 1e9925435e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_node/beacon_chain/src/block_verification.rs
View File

@ -754,22 +754,16 @@ impl<T: BeaconChainTypes> GossipVerifiedBlock<T> {
// reboot if the `observed_block_producers` cache is empty. In that case, without this // reboot if the `observed_block_producers` cache is empty. In that case, without this
// check, we will load the parent and state from disk only to find out later that we // check, we will load the parent and state from disk only to find out later that we
// already know this block. // already know this block.
if chain let fork_choice_read_lock = chain.canonical_head.fork_choice_read_lock();
.canonical_head if fork_choice_read_lock.contains_block(&block_root) {
.fork_choice_read_lock()
.contains_block(&block_root)
{
return Err(BlockError::BlockIsAlreadyKnown); return Err(BlockError::BlockIsAlreadyKnown);
} }
// Do not process a block that doesn't descend from the finalized root. // Do not process a block that doesn't descend from the finalized root.
// //
// We check this *before* we load the parent so that we can return a more detailed error. // We check this *before* we load the parent so that we can return a more detailed error.
check_block_is_finalized_checkpoint_or_descendant( check_block_is_finalized_checkpoint_or_descendant(chain, &fork_choice_read_lock, &block)?;
chain, drop(fork_choice_read_lock);
&chain.canonical_head.fork_choice_read_lock(),
&block,
)?;
let block_epoch = block.slot().epoch(T::EthSpec::slots_per_epoch()); let block_epoch = block.slot().epoch(T::EthSpec::slots_per_epoch());
let (parent_block, block) = verify_parent_block_is_known(chain, block)?; let (parent_block, block) = verify_parent_block_is_known(chain, block)?;