Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Ensure candidate-backing and provisioner exit on missing Overseer #6939

Merged
merged 1 commit into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions node/core/backing/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ pub enum Error {

#[error(transparent)]
SubsystemError(#[from] SubsystemError),

#[fatal]
#[error(transparent)]
OverseerExited(SubsystemError),
mrcnski marked this conversation as resolved.
Show resolved Hide resolved
}

/// Utility for eating top level errors and log them.
Expand Down
3 changes: 2 additions & 1 deletion node/core/backing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ async fn run_iteration<Context>(
}
}
from_overseer = ctx.recv().fuse() => {
match from_overseer? {
// Map the error to ensure that the subsystem exits when the overseer is gone.
match from_overseer.map_err(Error::OverseerExited)? {
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) => handle_active_leaves_update(
&mut *ctx,
update,
Expand Down
4 changes: 4 additions & 0 deletions node/core/provisioner/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ pub enum Error {

#[error(transparent)]
SubsystemError(#[from] SubsystemError),

#[fatal]
#[error(transparent)]
OverseerExited(SubsystemError),
}

/// Used by `get_onchain_disputes` to represent errors related to fetching on-chain disputes from the Runtime
Expand Down
3 changes: 2 additions & 1 deletion node/core/provisioner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ async fn run_iteration<Context>(
loop {
futures::select! {
from_overseer = ctx.recv().fuse() => {
match from_overseer? {
// Map the error to ensure that the subsystem exits when the overseer is gone.
match from_overseer.map_err(Error::OverseerExited)? {
FromOrchestra::Signal(OverseerSignal::ActiveLeaves(update)) =>
handle_active_leaves_update(update, per_relay_parent, inherent_delays),
FromOrchestra::Signal(OverseerSignal::BlockFinalized(..)) => {},
Expand Down