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

Don't indefinitely block on shutting down Tokio #12885

Merged
paritytech-processbot merged 2 commits into from
Dec 9, 2022
Merged

Don't indefinitely block on shutting down Tokio #12885

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8e85f8
Don't indefinitely on shutting down Tokio
bkchr Dec 9, 2022
e7b10ed
Drink less :thinking_face:
bkchr Dec 9, 2022
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
8 changes: 6 additions & 2 deletions client/cli/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use futures::{future, future::FutureExt, pin_mut, select, Future};
use log::info;
use sc_service::{Configuration, Error as ServiceError, TaskManager};
use sc_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
use std::marker::PhantomData;
use std::{marker::PhantomData, time::Duration};

#[cfg(target_family = "unix")]
async fn main<F, E>(func: F) -> std::result::Result<(), E>
Expand Down Expand Up @@ -147,7 +147,11 @@ impl<C: SubstrateCli> Runner<C> {
self.print_node_infos();
let mut task_manager = self.tokio_runtime.block_on(initialize(self.config))?;
let res = self.tokio_runtime.block_on(main(task_manager.future().fuse()));
Ok(res?)

// Give all futures 60 seconds to shutdown, before tokio "leaks" them.
self.tokio_runtime.shutdown_timeout(Duration::from_secs(60));

res.map_err(Into::into)
}

/// A helper function that runs a command with the configuration of this node.
Expand Down