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

Merge branch 'unstable' of https://github.com/sigp/lighthouse into gloas-range-sync

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-04 14:58:16 +03:00
parent 3015fa4842 9cf155a0dd
commit 3d23f9be0d
24 changed files with 856 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
beacon_node/beacon_processor/src/scheduler/work_reprocessing_queue.rs
View File

@@ -280,8 +280,8 @@ struct ReprocessQueue<S> {
queued_lc_updates: FnvHashMap<usize, (QueuedLightClientUpdate, DelayKey)>,
/// Light Client Updates per parent_root.
awaiting_lc_updates_per_parent_root: HashMap<Hash256, Vec<QueuedLightClientUpdateId>>,
/// Column reconstruction per block root.
queued_column_reconstructions: HashMap<Hash256, DelayKey>,
/// Column reconstruction per block root. `None` means reconstruction was already dispatched.
queued_column_reconstructions: HashMap<Hash256, Option<DelayKey>>,
/// Queued backfill batches
queued_backfill_batches: Vec<QueuedBackfillBatch>,
@@ -865,20 +865,20 @@ impl<S: SlotClock> ReprocessQueue<S> {
&& duration_from_current_slot >= reconstruction_deadline
&& current_slot == request.slot
{
// If we are at least `reconstruction_deadline` seconds into the current slot,
// and the reconstruction request is for the current slot, process reconstruction immediately.
reconstruction_delay = Duration::from_secs(0);
}
match self.queued_column_reconstructions.entry(request.block_root) {
Entry::Occupied(key) => {
self.column_reconstructions_delay_queue
.reset(key.get(), reconstruction_delay);
Entry::Occupied(entry) => {
if let Some(delay_key) = entry.get() {
self.column_reconstructions_delay_queue
.reset(delay_key, reconstruction_delay);
}
}
Entry::Vacant(vacant) => {
let delay_key = self
.column_reconstructions_delay_queue
.insert(request, reconstruction_delay);
vacant.insert(delay_key);
vacant.insert(Some(delay_key));
}
}
}
@@ -1039,7 +1039,9 @@ impl<S: SlotClock> ReprocessQueue<S> {
}
InboundEvent::ReadyColumnReconstruction(column_reconstruction) => {
self.queued_column_reconstructions
.remove(&column_reconstruction.block_root);
.retain(|_, v| v.is_some());
self.queued_column_reconstructions
.insert(column_reconstruction.block_root, None);
if self
.ready_work_tx
.try_send(ReadyWork::ColumnReconstruction(column_reconstruction))
@@ -1398,7 +1400,10 @@ mod tests {
queue.handle_message(InboundEvent::ReadyColumnReconstruction(reconstruction));
}
assert!(queue.queued_column_reconstructions.is_empty());
assert_eq!(
queue.queued_column_reconstructions.get(&block_root),
Some(&None)
);
}
/// Tests that column reconstruction queued after the deadline is triggered immediately