be4e261e74
## Overview This rather extensive PR achieves two primary goals: 1. Uses the finalized/justified checkpoints of fork choice (FC), rather than that of the head state. 2. Refactors fork choice, block production and block processing to `async` functions. Additionally, it achieves: - Concurrent forkchoice updates to the EL and cache pruning after a new head is selected. - Concurrent "block packing" (attestations, etc) and execution payload retrieval during block production. - Concurrent per-block-processing and execution payload verification during block processing. - The `Arc`-ification of `SignedBeaconBlock` during block processing (it's never mutated, so why not?): - I had to do this to deal with sending blocks into spawned tasks. - Previously we were cloning the beacon block at least 2 times during each block processing, these clones are either removed or turned into cheaper `Arc` clones. - We were also `Box`-ing and un-`Box`-ing beacon blocks as they moved throughout the networking crate. This is not a big deal, but it's nice to avoid shifting things between the stack and heap. - Avoids cloning *all the blocks* in *every chain segment* during sync. - It also has the potential to clean up our code where we need to pass an *owned* block around so we can send it back in the case of an error (I didn't do much of this, my PR is already big enough 😅) - The `BeaconChain::HeadSafetyStatus` struct was removed. It was an old relic from prior merge specs. For motivation for this change, see https://github.com/sigp/lighthouse/pull/3244#issuecomment-1160963273 ## Changes to `canonical_head` and `fork_choice` Previously, the `BeaconChain` had two separate fields: ``` canonical_head: RwLock<Snapshot>, fork_choice: RwLock<BeaconForkChoice> ``` Now, we have grouped these values under a single struct: ``` canonical_head: CanonicalHead { cached_head: RwLock<Arc<Snapshot>>, fork_choice: RwLock<BeaconForkChoice> } ``` Apart from ergonomics, the only *actual* change here is wrapping the canonical head snapshot in an `Arc`. This means that we no longer need to hold the `cached_head` (`canonical_head`, in old terms) lock when we want to pull some values from it. This was done to avoid deadlock risks by preventing functions from acquiring (and holding) the `cached_head` and `fork_choice` locks simultaneously. ## Breaking Changes ### The `state` (root) field in the `finalized_checkpoint` SSE event Consider the scenario where epoch `n` is just finalized, but `start_slot(n)` is skipped. There are two state roots we might in the `finalized_checkpoint` SSE event: 1. The state root of the finalized block, which is `get_block(finalized_checkpoint.root).state_root`. 4. The state root at slot of `start_slot(n)`, which would be the state from (1), but "skipped forward" through any skip slots. Previously, Lighthouse would choose (2). However, we can see that when [Teku generates that event](de2b2801c8/data/beaconrestapi/src/main/java/tech/pegasys/teku/beaconrestapi/handlers/v1/events/EventSubscriptionManager.java (L171-L182)
) it uses [`getStateRootFromBlockRoot`](de2b2801c8/data/provider/src/main/java/tech/pegasys/teku/api/ChainDataProvider.java (L336-L341)
) which uses (1). I have switched Lighthouse from (2) to (1). I think it's a somewhat arbitrary choice between the two, where (1) is easier to compute and is consistent with Teku. ## Notes for Reviewers I've renamed `BeaconChain::fork_choice` to `BeaconChain::recompute_head`. Doing this helped ensure I broke all previous uses of fork choice and I also find it more descriptive. It describes an action and can't be confused with trying to get a reference to the `ForkChoice` struct. I've changed the ordering of SSE events when a block is received. It used to be `[block, finalized, head]` and now it's `[block, head, finalized]`. It was easier this way and I don't think we were making any promises about SSE event ordering so it's not "breaking". I've made it so fork choice will run when it's first constructed. I did this because I wanted to have a cached version of the last call to `get_head`. Ensuring `get_head` has been run *at least once* means that the cached values doesn't need to wrapped in an `Option`. This was fairly simple, it just involved passing a `slot` to the constructor so it knows *when* it's being run. When loading a fork choice from the store and a slot clock isn't handy I've just used the `slot` that was saved in the `fork_choice_store`. That seems like it would be a faithful representation of the slot when we saved it. I added the `genesis_time: u64` to the `BeaconChain`. It's small, constant and nice to have around. Since we're using FC for the fin/just checkpoints, we no longer get the `0x00..00` roots at genesis. You can see I had to remove a work-around in `ef-tests` here: b56be3bc2. I can't find any reason why this would be an issue, if anything I think it'll be better since the genesis-alias has caught us out a few times (0x00..00 isn't actually a real root). Edit: I did find a case where the `network` expected the 0x00..00 alias and patched it here: 3f26ac3e2. You'll notice a lot of changes in tests. Generally, tests should be functionally equivalent. Here are the things creating the most diff-noise in tests: - Changing tests to be `tokio::async` tests. - Adding `.await` to fork choice, block processing and block production functions. - Refactor of the `canonical_head` "API" provided by the `BeaconChain`. E.g., `chain.canonical_head.cached_head()` instead of `chain.canonical_head.read()`. - Wrapping `SignedBeaconBlock` in an `Arc`. - In the `beacon_chain/tests/block_verification`, we can't use the `lazy_static` `CHAIN_SEGMENT` variable anymore since it's generated with an async function. We just generate it in each test, not so efficient but hopefully insignificant. I had to disable `rayon` concurrent tests in the `fork_choice` tests. This is because the use of `rayon` and `block_on` was causing a panic. Co-authored-by: Mac L <mjladson@pm.me>
392 lines
14 KiB
Rust
392 lines
14 KiB
Rust
mod metrics;
|
|
pub mod test_utils;
|
|
|
|
use futures::channel::mpsc::Sender;
|
|
use futures::prelude::*;
|
|
use slog::{crit, debug, o, trace};
|
|
use std::sync::Weak;
|
|
use tokio::runtime::{Handle, Runtime};
|
|
|
|
pub use tokio::task::JoinHandle;
|
|
|
|
/// Provides a reason when Lighthouse is shut down.
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
|
pub enum ShutdownReason {
|
|
/// The node shut down successfully.
|
|
Success(&'static str),
|
|
/// The node shut down due to an error condition.
|
|
Failure(&'static str),
|
|
}
|
|
|
|
impl ShutdownReason {
|
|
pub fn message(&self) -> &'static str {
|
|
match self {
|
|
ShutdownReason::Success(msg) => msg,
|
|
ShutdownReason::Failure(msg) => msg,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Provides a `Handle` by either:
|
|
///
|
|
/// 1. Holding a `Weak<Runtime>` and calling `Runtime::handle`.
|
|
/// 2. Directly holding a `Handle` and cloning it.
|
|
///
|
|
/// This enum allows the `TaskExecutor` to work in production where a `Weak<Runtime>` is directly
|
|
/// accessible and in testing where the `Runtime` is hidden outside our scope.
|
|
#[derive(Clone)]
|
|
pub enum HandleProvider {
|
|
Runtime(Weak<Runtime>),
|
|
Handle(Handle),
|
|
}
|
|
|
|
impl From<Handle> for HandleProvider {
|
|
fn from(handle: Handle) -> Self {
|
|
HandleProvider::Handle(handle)
|
|
}
|
|
}
|
|
|
|
impl From<Weak<Runtime>> for HandleProvider {
|
|
fn from(weak_runtime: Weak<Runtime>) -> Self {
|
|
HandleProvider::Runtime(weak_runtime)
|
|
}
|
|
}
|
|
|
|
impl HandleProvider {
|
|
/// Returns a `Handle` to a `Runtime`.
|
|
///
|
|
/// May return `None` if the weak reference to the `Runtime` has been dropped (this generally
|
|
/// means Lighthouse is shutting down).
|
|
pub fn handle(&self) -> Option<Handle> {
|
|
match self {
|
|
HandleProvider::Runtime(weak_runtime) => weak_runtime
|
|
.upgrade()
|
|
.map(|runtime| runtime.handle().clone()),
|
|
HandleProvider::Handle(handle) => Some(handle.clone()),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A wrapper over a runtime handle which can spawn async and blocking tasks.
|
|
#[derive(Clone)]
|
|
pub struct TaskExecutor {
|
|
/// The handle to the runtime on which tasks are spawned
|
|
handle_provider: HandleProvider,
|
|
/// The receiver exit future which on receiving shuts down the task
|
|
exit: exit_future::Exit,
|
|
/// Sender given to tasks, so that if they encounter a state in which execution cannot
|
|
/// continue they can request that everything shuts down.
|
|
///
|
|
/// The task must provide a reason for shutting down.
|
|
signal_tx: Sender<ShutdownReason>,
|
|
|
|
log: slog::Logger,
|
|
}
|
|
|
|
impl TaskExecutor {
|
|
/// Create a new task executor.
|
|
///
|
|
/// ## Note
|
|
///
|
|
/// This function should only be used during testing. In production, prefer to obtain an
|
|
/// instance of `Self` via a `environment::RuntimeContext` (see the `lighthouse/environment`
|
|
/// crate).
|
|
pub fn new<T: Into<HandleProvider>>(
|
|
handle: T,
|
|
exit: exit_future::Exit,
|
|
log: slog::Logger,
|
|
signal_tx: Sender<ShutdownReason>,
|
|
) -> Self {
|
|
Self {
|
|
handle_provider: handle.into(),
|
|
exit,
|
|
signal_tx,
|
|
log,
|
|
}
|
|
}
|
|
|
|
/// Clones the task executor adding a service name.
|
|
pub fn clone_with_name(&self, service_name: String) -> Self {
|
|
TaskExecutor {
|
|
handle_provider: self.handle_provider.clone(),
|
|
exit: self.exit.clone(),
|
|
signal_tx: self.signal_tx.clone(),
|
|
log: self.log.new(o!("service" => service_name)),
|
|
}
|
|
}
|
|
|
|
/// A convenience wrapper for `Self::spawn` which ignores a `Result` as long as both `Ok`/`Err`
|
|
/// are of type `()`.
|
|
///
|
|
/// The purpose of this function is to create a compile error if some function which previously
|
|
/// returned `()` starts returning something else. Such a case may otherwise result in
|
|
/// accidental error suppression.
|
|
pub fn spawn_ignoring_error(
|
|
&self,
|
|
task: impl Future<Output = Result<(), ()>> + Send + 'static,
|
|
name: &'static str,
|
|
) {
|
|
self.spawn(task.map(|_| ()), name)
|
|
}
|
|
|
|
/// Spawn a task to monitor the completion of another task.
|
|
///
|
|
/// If the other task exits by panicking, then the monitor task will shut down the executor.
|
|
fn spawn_monitor<R: Send>(
|
|
&self,
|
|
task_handle: impl Future<Output = Result<R, tokio::task::JoinError>> + Send + 'static,
|
|
name: &'static str,
|
|
) {
|
|
let mut shutdown_sender = self.shutdown_sender();
|
|
let log = self.log.clone();
|
|
|
|
if let Some(handle) = self.handle() {
|
|
handle.spawn(async move {
|
|
let timer = metrics::start_timer_vec(&metrics::TASKS_HISTOGRAM, &[name]);
|
|
if let Err(join_error) = task_handle.await {
|
|
if let Ok(panic) = join_error.try_into_panic() {
|
|
let message = panic.downcast_ref::<&str>().unwrap_or(&"<none>");
|
|
|
|
crit!(
|
|
log,
|
|
"Task panic. This is a bug!";
|
|
"task_name" => name,
|
|
"message" => message,
|
|
"advice" => "Please check above for a backtrace and notify \
|
|
the developers"
|
|
);
|
|
let _ = shutdown_sender
|
|
.try_send(ShutdownReason::Failure("Panic (fatal error)"));
|
|
}
|
|
}
|
|
drop(timer);
|
|
});
|
|
} else {
|
|
debug!(
|
|
self.log,
|
|
"Couldn't spawn monitor task. Runtime shutting down"
|
|
)
|
|
}
|
|
}
|
|
|
|
/// Spawn a future on the tokio runtime.
|
|
///
|
|
/// The future is wrapped in an `exit_future::Exit`. The task is cancelled when the corresponding
|
|
/// exit_future `Signal` is fired/dropped.
|
|
///
|
|
/// The future is monitored via another spawned future to ensure that it doesn't panic. In case
|
|
/// of a panic, the executor will be shut down via `self.signal_tx`.
|
|
///
|
|
/// This function generates prometheus metrics on number of tasks and task duration.
|
|
pub fn spawn(&self, task: impl Future<Output = ()> + Send + 'static, name: &'static str) {
|
|
if let Some(task_handle) = self.spawn_handle(task, name) {
|
|
self.spawn_monitor(task_handle, name)
|
|
}
|
|
}
|
|
|
|
/// Spawn a future on the tokio runtime. This function does not wrap the task in an `exit_future::Exit`
|
|
/// like [spawn](#method.spawn).
|
|
/// The caller of this function is responsible for wrapping up the task with an `exit_future::Exit` to
|
|
/// ensure that the task gets canceled appropriately.
|
|
/// This function generates prometheus metrics on number of tasks and task duration.
|
|
///
|
|
/// This is useful in cases where the future to be spawned needs to do additional cleanup work when
|
|
/// the task is completed/canceled (e.g. writing local variables to disk) or the task is created from
|
|
/// some framework which does its own cleanup (e.g. a hyper server).
|
|
pub fn spawn_without_exit(
|
|
&self,
|
|
task: impl Future<Output = ()> + Send + 'static,
|
|
name: &'static str,
|
|
) {
|
|
if let Some(int_gauge) = metrics::get_int_gauge(&metrics::ASYNC_TASKS_COUNT, &[name]) {
|
|
let int_gauge_1 = int_gauge.clone();
|
|
let future = task.then(move |_| {
|
|
int_gauge_1.dec();
|
|
futures::future::ready(())
|
|
});
|
|
|
|
int_gauge.inc();
|
|
if let Some(handle) = self.handle() {
|
|
handle.spawn(future);
|
|
} else {
|
|
debug!(self.log, "Couldn't spawn task. Runtime shutting down");
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Spawn a blocking task on a dedicated tokio thread pool wrapped in an exit future.
|
|
/// This function generates prometheus metrics on number of tasks and task duration.
|
|
pub fn spawn_blocking<F>(&self, task: F, name: &'static str)
|
|
where
|
|
F: FnOnce() + Send + 'static,
|
|
{
|
|
if let Some(task_handle) = self.spawn_blocking_handle(task, name) {
|
|
self.spawn_monitor(task_handle, name)
|
|
}
|
|
}
|
|
|
|
/// Spawn a future on the tokio runtime wrapped in an `exit_future::Exit` returning an optional
|
|
/// join handle to the future.
|
|
/// The task is canceled when the corresponding exit_future `Signal` is fired/dropped.
|
|
///
|
|
/// This function generates prometheus metrics on number of tasks and task duration.
|
|
pub fn spawn_handle<R: Send + 'static>(
|
|
&self,
|
|
task: impl Future<Output = R> + Send + 'static,
|
|
name: &'static str,
|
|
) -> Option<tokio::task::JoinHandle<Option<R>>> {
|
|
let exit = self.exit.clone();
|
|
let log = self.log.clone();
|
|
|
|
if let Some(int_gauge) = metrics::get_int_gauge(&metrics::ASYNC_TASKS_COUNT, &[name]) {
|
|
// Task is shutdown before it completes if `exit` receives
|
|
let int_gauge_1 = int_gauge.clone();
|
|
let future = future::select(Box::pin(task), exit).then(move |either| {
|
|
let result = match either {
|
|
future::Either::Left((value, _)) => {
|
|
trace!(log, "Async task completed"; "task" => name);
|
|
Some(value)
|
|
}
|
|
future::Either::Right(_) => {
|
|
debug!(log, "Async task shutdown, exit received"; "task" => name);
|
|
None
|
|
}
|
|
};
|
|
int_gauge_1.dec();
|
|
futures::future::ready(result)
|
|
});
|
|
|
|
int_gauge.inc();
|
|
if let Some(handle) = self.handle() {
|
|
Some(handle.spawn(future))
|
|
} else {
|
|
debug!(self.log, "Couldn't spawn task. Runtime shutting down");
|
|
None
|
|
}
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Spawn a blocking task on a dedicated tokio thread pool wrapped in an exit future returning
|
|
/// a join handle to the future.
|
|
/// If the runtime doesn't exist, this will return None.
|
|
/// The Future returned behaves like the standard JoinHandle which can return an error if the
|
|
/// task failed.
|
|
/// This function generates prometheus metrics on number of tasks and task duration.
|
|
pub fn spawn_blocking_handle<F, R>(
|
|
&self,
|
|
task: F,
|
|
name: &'static str,
|
|
) -> Option<impl Future<Output = Result<R, tokio::task::JoinError>>>
|
|
where
|
|
F: FnOnce() -> R + Send + 'static,
|
|
R: Send + 'static,
|
|
{
|
|
let log = self.log.clone();
|
|
|
|
let timer = metrics::start_timer_vec(&metrics::BLOCKING_TASKS_HISTOGRAM, &[name]);
|
|
metrics::inc_gauge_vec(&metrics::BLOCKING_TASKS_COUNT, &[name]);
|
|
|
|
let join_handle = if let Some(handle) = self.handle() {
|
|
handle.spawn_blocking(task)
|
|
} else {
|
|
debug!(self.log, "Couldn't spawn task. Runtime shutting down");
|
|
return None;
|
|
};
|
|
|
|
let future = async move {
|
|
let result = match join_handle.await {
|
|
Ok(result) => {
|
|
trace!(log, "Blocking task completed"; "task" => name);
|
|
Ok(result)
|
|
}
|
|
Err(e) => {
|
|
debug!(log, "Blocking task ended unexpectedly"; "error" => %e);
|
|
Err(e)
|
|
}
|
|
};
|
|
drop(timer);
|
|
metrics::dec_gauge_vec(&metrics::BLOCKING_TASKS_COUNT, &[name]);
|
|
result
|
|
};
|
|
|
|
Some(future)
|
|
}
|
|
|
|
/// Block the current (non-async) thread on the completion of some future.
|
|
///
|
|
/// ## Warning
|
|
///
|
|
/// This method is "dangerous" since calling it from an async thread will result in a panic! Any
|
|
/// use of this outside of testing should be very deeply considered as Lighthouse has been
|
|
/// burned by this function in the past.
|
|
///
|
|
/// Determining what is an "async thread" is rather challenging; just because a function isn't
|
|
/// marked as `async` doesn't mean it's not being called from an `async` function or there isn't
|
|
/// a `tokio` context present in the thread-local storage due to some `rayon` funkiness. Talk to
|
|
/// @paulhauner if you plan to use this function in production. He has put metrics in here to
|
|
/// track any use of it, so don't think you can pull a sneaky one on him.
|
|
pub fn block_on_dangerous<F: Future>(
|
|
&self,
|
|
future: F,
|
|
name: &'static str,
|
|
) -> Option<F::Output> {
|
|
let timer = metrics::start_timer_vec(&metrics::BLOCK_ON_TASKS_HISTOGRAM, &[name]);
|
|
metrics::inc_gauge_vec(&metrics::BLOCK_ON_TASKS_COUNT, &[name]);
|
|
let log = self.log.clone();
|
|
let handle = self.handle()?;
|
|
let exit = self.exit.clone();
|
|
|
|
debug!(
|
|
log,
|
|
"Starting block_on task";
|
|
"name" => name
|
|
);
|
|
|
|
handle.block_on(async {
|
|
let output = tokio::select! {
|
|
output = future => {
|
|
debug!(
|
|
log,
|
|
"Completed block_on task";
|
|
"name" => name
|
|
);
|
|
Some(output)
|
|
},
|
|
_ = exit => {
|
|
debug!(
|
|
log,
|
|
"Cancelled block_on task";
|
|
"name" => name,
|
|
);
|
|
None
|
|
}
|
|
};
|
|
metrics::dec_gauge_vec(&metrics::BLOCK_ON_TASKS_COUNT, &[name]);
|
|
drop(timer);
|
|
output
|
|
})
|
|
}
|
|
|
|
/// Returns a `Handle` to the current runtime.
|
|
pub fn handle(&self) -> Option<Handle> {
|
|
self.handle_provider.handle()
|
|
}
|
|
|
|
/// Returns a copy of the `exit_future::Exit`.
|
|
pub fn exit(&self) -> exit_future::Exit {
|
|
self.exit.clone()
|
|
}
|
|
|
|
/// Get a channel to request shutting down.
|
|
pub fn shutdown_sender(&self) -> Sender<ShutdownReason> {
|
|
self.signal_tx.clone()
|
|
}
|
|
|
|
/// Returns a reference to the logger.
|
|
pub fn log(&self) -> &slog::Logger {
|
|
&self.log
|
|
}
|
|
}
|