Improve tokio task execution (#1181)

* Add logging on shutdown

* Replace tokio::spawn with handle.spawn

* Upgrade tokio

* Add a task executor

* Beacon chain tasks use task executor

* Validator client tasks use task executor

* Rename runtime_handle to executor

* Add duration histograms; minor fixes

* Cleanup

* Fix logs

* Fix tests

* Remove random file

* Get enr dependency instead of libp2p

* Address some review comments

* Libp2p takes a TaskExecutor

* Ugly fix libp2p tests

* Move TaskExecutor to own file

* Upgrade Dockerfile rust version

* Minor fixes

* Revert "Ugly fix libp2p tests"

This reverts commit 58d4bb690f.

* Pretty fix libp2p tests

* Add spawn_without_exit; change Counter to Gauge

* Tidy

* Move log from RuntimeContext to TaskExecutor

* Fix errors

* Replace histogram with int_gauge for async tasks

* Fix todo

* Fix memory leak in test by exiting all spawned tasks at the end

beacon_node/rest_api/Cargo.toml

@@ -25,7 +25,7 @@ state_processing = { path = "../../consensus/state_processing" }
 types = { path = "../../consensus/types" }
 http = "0.2.1"
 hyper = "0.13.5"
-tokio = { version = "0.2", features = ["sync"] }
+tokio = { version = "0.2.21", features = ["sync"] }
 url = "2.1.1"
 lazy_static = "1.4.0"
 eth2_config = { path = "../../common/eth2_config" }
@@ -36,6 +36,7 @@ parking_lot = "0.10.2"
 futures = "0.3.5"
 operation_pool = { path = "../operation_pool" }
 rayon = "1.3.0"
+environment = { path = "../../lighthouse/environment" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"

beacon_node/rest_api/src/lib.rs

@@ -35,7 +35,7 @@ use std::net::SocketAddr;
 use std::ops::Deref;
 use std::path::PathBuf;
 use std::sync::Arc;
-use tokio::sync::{mpsc, oneshot};
+use tokio::sync::mpsc;
 use url_query::UrlQuery;
 
 pub use crate::helpers::parse_pubkey_bytes;
@@ -51,14 +51,15 @@ pub struct NetworkInfo<T: BeaconChainTypes> {
 // Allowing more than 7 arguments.
 #[allow(clippy::too_many_arguments)]
 pub fn start_server<T: BeaconChainTypes>(
+    executor: environment::TaskExecutor,
     config: &Config,
     beacon_chain: Arc<BeaconChain<T>>,
     network_info: NetworkInfo<T>,
     db_path: PathBuf,
     freezer_db_path: PathBuf,
     eth2_config: Eth2Config,
-    log: slog::Logger,
-) -> Result<(oneshot::Sender<()>, SocketAddr), hyper::Error> {
+) -> Result<SocketAddr, hyper::Error> {
+    let log = executor.log();
     let inner_log = log.clone();
     let eth2_config = Arc::new(eth2_config);
 
@@ -98,7 +99,7 @@ pub fn start_server<T: BeaconChainTypes>(
     let actual_listen_addr = server.local_addr();
 
     // Build a channel to kill the HTTP server.
-    let (exit_signal, exit) = oneshot::channel::<()>();
+    let exit = executor.exit();
     let inner_log = log.clone();
     let server_exit = async move {
         let _ = exit.await;
@@ -116,7 +117,8 @@ pub fn start_server<T: BeaconChainTypes>(
             inner_log,
             "HTTP server failed to start, Unable to bind"; "address" => format!("{:?}", e)
             )
-        });
+        })
+        .unwrap_or_else(|_| ());
 
     info!(
         log,
@@ -125,9 +127,9 @@ pub fn start_server<T: BeaconChainTypes>(
         "port" => actual_listen_addr.port(),
     );
 
-    tokio::spawn(server_future);
+    executor.spawn_without_exit(server_future, "http");
 
-    Ok((exit_signal, actual_listen_addr))
+    Ok(actual_listen_addr)
 }
 
 #[derive(Clone)]