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

[Merged by Bors] - Harden slot notifier against clock drift #3519

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Harden slot notifier against clock drift #3519

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
26 changes: 14 additions & 12 deletions beacon_node/client/src/notifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,9 @@ pub fn spawn_notifier<T: BeaconChainTypes>(
seconds_per_slot: u64,
) -> Result<(), String> {
let slot_duration = Duration::from_secs(seconds_per_slot);
let duration_to_next_slot = beacon_chain
.slot_clock
.duration_to_next_slot()
.ok_or("slot_notifier unable to determine time to next slot")?;

// Run this half way through each slot.
let start_instant = tokio::time::Instant::now() + duration_to_next_slot + (slot_duration / 2);

// Run this each slot.
let interval_duration = slot_duration;

let speedo = Mutex::new(Speedo::default());
let log = executor.log().clone();
let mut interval = tokio::time::interval_at(start_instant, interval_duration);

// Keep track of sync state and reset the speedo on specific sync state changes.
// Specifically, if we switch between a sync and a backfill sync, reset the speedo.
Expand Down Expand Up @@ -82,7 +71,20 @@ pub fn spawn_notifier<T: BeaconChainTypes>(
let mut last_backfill_log_slot = None;

loop {
interval.tick().await;
// Run the notifier half way through each slot.
//
// Keep remeasuring the offset rather than using an interval, so that we can correct
// for system time clock adjustments.
let wait = match beacon_chain.slot_clock.duration_to_next_slot() {
Some(duration) => duration + slot_duration / 2,
None => {
warn!(log, "Unable to read current slot");
sleep(slot_duration).await;
continue;
}
};
sleep(wait).await;

let connected_peer_count = network.connected_peers();
let sync_state = network.sync_state();

Expand Down