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

Call per_slot_task from a blocking thread (v2) (#3199)

Browse Source 
*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>
This commit is contained in:
Paul Hauner 2022-05-20 23:05:07 +00:00
parent 2291a14871
commit 7a64994283
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -4405,6 +4405,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
} }
/// Called by the timer on every slot. /// Called by the timer on every slot.
///
/// Note: this function **MUST** be called from a non-async context since
/// it contains a call to `fork_choice` which may eventually call
/// `tokio::runtime::block_on` in certain cases.
pub fn per_slot_task(self: &Arc<Self>) { pub fn per_slot_task(self: &Arc<Self>) {
trace!(self.log, "Running beacon chain per slot tasks"); trace!(self.log, "Running beacon chain per slot tasks");
if let Some(slot) = self.slot_clock.now() { if let Some(slot) = self.slot_clock.now() {

24
beacon_node/timer/src/lib.rs
View File

@ -3,7 +3,7 @@
//! This service allows task execution on the beacon node for various functionality. //! This service allows task execution on the beacon node for various functionality.
use beacon_chain::{BeaconChain, BeaconChainTypes}; use beacon_chain::{BeaconChain, BeaconChainTypes};
use slog::info; use slog::{debug, info, warn};
use slot_clock::SlotClock; use slot_clock::SlotClock;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
@ -24,10 +24,30 @@ pub fn spawn_timer<T: BeaconChainTypes>(
// Warning: `interval_at` panics if `seconds_per_slot` = 0. // Warning: `interval_at` panics if `seconds_per_slot` = 0.
let mut interval = interval_at(start_instant, Duration::from_secs(seconds_per_slot)); 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 timer_future = async move {
let log = per_slot_executor.log().clone();
loop { loop {
interval.tick().await; interval.tick().await;
beacon_chain.per_slot_task(); 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;
}
} }
}; };