mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +00:00
*This PR was adapted from @pawanjay176's work in #3197.* ## Issue Addressed Fixes a regression in https://github.com/sigp/lighthouse/pull/3168 ## Proposed Changes https://github.com/sigp/lighthouse/pull/3168 added calls to `fork_choice` in `BeaconChain::per_slot_task` function. This leads to a panic as `per_slot_task` is called from an async context which calls fork choice, which then calls `block_on`. This PR changes the timer to call the `per_slot_task` function in a blocking thread. Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>
59 lines
1.9 KiB
Rust
59 lines
1.9 KiB
Rust
//! A timer service for the beacon node.
|
|
//!
|
|
//! This service allows task execution on the beacon node for various functionality.
|
|
|
|
use beacon_chain::{BeaconChain, BeaconChainTypes};
|
|
use slog::{debug, info, warn};
|
|
use slot_clock::SlotClock;
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
use tokio::time::{interval_at, Instant};
|
|
|
|
/// Spawns a timer service which periodically executes tasks for the beacon chain
|
|
pub fn spawn_timer<T: BeaconChainTypes>(
|
|
executor: task_executor::TaskExecutor,
|
|
beacon_chain: Arc<BeaconChain<T>>,
|
|
seconds_per_slot: u64,
|
|
) -> Result<(), &'static str> {
|
|
let log = executor.log();
|
|
let start_instant = Instant::now()
|
|
+ beacon_chain
|
|
.slot_clock
|
|
.duration_to_next_slot()
|
|
.ok_or("slot_notifier unable to determine time to next slot")?;
|
|
|
|
// Warning: `interval_at` panics if `seconds_per_slot` = 0.
|
|
let mut interval = interval_at(start_instant, Duration::from_secs(seconds_per_slot));
|
|
let per_slot_executor = executor.clone();
|
|
let timer_future = async move {
|
|
let log = per_slot_executor.log().clone();
|
|
loop {
|
|
interval.tick().await;
|
|
let chain = beacon_chain.clone();
|
|
if let Some(handle) = per_slot_executor
|
|
.spawn_blocking_handle(move || chain.per_slot_task(), "timer_per_slot_task")
|
|
{
|
|
if let Err(e) = handle.await {
|
|
warn!(
|
|
log,
|
|
"Per slot task failed";
|
|
"info" => ?e
|
|
);
|
|
}
|
|
} else {
|
|
debug!(
|
|
log,
|
|
"Per slot task timer stopped";
|
|
"info" => "shutting down"
|
|
);
|
|
break;
|
|
}
|
|
}
|
|
};
|
|
|
|
executor.spawn(timer_future, "timer");
|
|
info!(log, "Timer service started");
|
|
|
|
Ok(())
|
|
}
|