neard: handle SIGINT by stopping the node (#4449)

Stop the system once a SIGINT is received. This should allow for graceful termination since System::stop will stop all the arbiters and that in turn will stop all the actors (leading them through stopping and stopped states thus allowing all the necessary cleanups). To achieve this, also update uptade wasmer-runtime-core dependency to 0.17.4. Among other things, the new version no longer catches the INT signal making it available for tokie to handle. Issue: #3266
near · Jul 5, 2021 · 168d487 · 168d487
1 parent ac9694a
commit 168d487
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/neard/Cargo.toml b/neard/Cargo.toml
@@ -22,6 +22,7 @@ tracing-subscriber = "0.2.4"
 openssl-probe = "0.1.2"
 near-rust-allocator-proxy = { version = "0.2.8", optional = true }
 lazy_static = "1.4"
+tokio = "1.1"
 
 nearcore = { path = "../nearcore" }
 near-primitives = { path = "../core/primitives" }

diff --git a/neard/src/cli.rs b/neard/src/cli.rs
@@ -258,6 +258,9 @@ impl RunCmd {
         let sys = actix::System::new();
         sys.block_on(async move {
             nearcore::start_with_config(home_dir, near_config);
+            tokio::signal::ctrl_c().await.unwrap();
+            info!("Got Ctrl+C, stopping");
+            actix::System::current().stop();
         });
         sys.run().unwrap();
     }

diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml
@@ -17,7 +17,7 @@ borsh = "0.8.1"
 serde = { version = "1", features = ["derive"] }
 wasmer-runtime = { version="0.17.1", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near", optional = true }
 # Always used even for wasmer 1.0 for validating wasm, will be replaced when refactor prepare.rs
-wasmer-runtime-core = {version = "0.17.3", package = "wasmer-runtime-core-near" }
+wasmer-runtime-core = {version = "0.17.4", package = "wasmer-runtime-core-near" }
 wasmer = { version = "1.0.2", optional = true }
 wasmer-types = { version = "1.0.2", optional = true }
 wasmer-compiler-singlepass = { version = "1.0.2", optional = true, default-features = false, features = ["std", "enable-serde"] } # disable `rayon` feature.