gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 08:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swap finalized chains based on processed batches (#6203)

Browse Source 
* Shift from validated to processed
This commit is contained in:
Age Manning
2024-07-30 15:43:34 +10:00
committed by GitHub
parent f4ddc45914
commit 75e934842e
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/network/src/sync/range_sync/chain.rs
View File

@@ -111,9 +111,6 @@ pub struct SyncingChain<T: BeaconChainTypes> {
/// The current processing batch, if any. /// The current processing batch, if any.
current_processing_batch: Option<BatchId>, current_processing_batch: Option<BatchId>,
/// Batches validated by this chain.
validated_batches: u64,
/// The chain's log. /// The chain's log.
log: slog::Logger, log: slog::Logger,
} }
@@ -161,7 +158,6 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
attempted_optimistic_starts: HashSet::default(), attempted_optimistic_starts: HashSet::default(),
state: ChainSyncingState::Stopped, state: ChainSyncingState::Stopped,
current_processing_batch: None, current_processing_batch: None,
validated_batches: 0,
log: log.new(o!("chain" => id)), log: log.new(o!("chain" => id)),
} }
} }
@@ -182,8 +178,10 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
} }
/// Progress in epochs made by the chain /// Progress in epochs made by the chain
pub fn validated_epochs(&self) -> u64 { pub fn processed_epochs(&self) -> u64 {
self.validated_batches * EPOCHS_PER_BATCH self.processing_target
.saturating_sub(self.start_epoch)
.into()
} }
/// Returns the total count of pending blocks in all the batches of this chain /// Returns the total count of pending blocks in all the batches of this chain
@@ -654,7 +652,6 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
let removed_batches = std::mem::replace(&mut self.batches, remaining_batches); let removed_batches = std::mem::replace(&mut self.batches, remaining_batches);
for (id, batch) in removed_batches.into_iter() { for (id, batch) in removed_batches.into_iter() {
self.validated_batches = self.validated_batches.saturating_add(1);
// only for batches awaiting validation can we be sure the last attempt is // only for batches awaiting validation can we be sure the last attempt is
// right, and thus, that any different attempt is wrong // right, and thus, that any different attempt is wrong
match batch.state() { match batch.state() {
@@ -1166,7 +1163,6 @@ impl<T: BeaconChainTypes> slog::KV for SyncingChain<T> {
)?; )?;
serializer.emit_usize("batches", self.batches.len())?; serializer.emit_usize("batches", self.batches.len())?;
serializer.emit_usize("peers", self.peers.len())?; serializer.emit_usize("peers", self.peers.len())?;
serializer.emit_u64("validated_batches", self.validated_batches)?;
serializer.emit_arguments("state", &format_args!("{:?}", self.state))?; serializer.emit_arguments("state", &format_args!("{:?}", self.state))?;
slog::Result::Ok(()) slog::Result::Ok(())
} }

6
beacon_node/network/src/sync/range_sync/chain_collection.rs
View File

@@ -24,7 +24,7 @@ use types::{Epoch, Hash256, Slot};
const PARALLEL_HEAD_CHAINS: usize = 2; const PARALLEL_HEAD_CHAINS: usize = 2;
/// Minimum work we require a finalized chain to do before picking a chain with more peers. /// Minimum work we require a finalized chain to do before picking a chain with more peers.
const MIN_FINALIZED_CHAIN_VALIDATED_EPOCHS: u64 = 10; const MIN_FINALIZED_CHAIN_PROCESSED_EPOCHS: u64 = 10;
/// The state of the long range/batch sync. /// The state of the long range/batch sync.
#[derive(Clone)] #[derive(Clone)]
@@ -273,8 +273,8 @@ impl<T: BeaconChainTypes, C: BlockStorage> ChainCollection<T, C> {
// chains are different, check that they don't have the same number of peers // chains are different, check that they don't have the same number of peers
if let Some(syncing_chain) = self.finalized_chains.get_mut(&syncing_id) { if let Some(syncing_chain) = self.finalized_chains.get_mut(&syncing_id) {
if max_peers > syncing_chain.available_peers() if max_peers > syncing_chain.available_peers()
&& syncing_chain.validated_epochs() && syncing_chain.processed_epochs()
> MIN_FINALIZED_CHAIN_VALIDATED_EPOCHS > MIN_FINALIZED_CHAIN_PROCESSED_EPOCHS
{ {
syncing_chain.stop_syncing(); syncing_chain.stop_syncing();
old_id = Some(Some(syncing_id)); old_id = Some(Some(syncing_id));