Warn validators about stake deactivation

core/Cargo.toml

@@ -74,6 +74,7 @@ tokio-io = "0.1"
 untrusted = "0.7.0"
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.20.0" }
 reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
+ctrlc = "3.1.3"
 
 [dev-dependencies]
 hex-literal = "0.2.1"

core/src/validator.rs

@@ -1,4 +1,4 @@
-//! The `validator` module hosts all the validator microservices.
+//! The `fullnode` module hosts all the fullnode microservices.
 
 use crate::broadcast_stage::BroadcastStageType;
 use crate::cluster_info::{ClusterInfo, Node};
@@ -29,11 +29,15 @@ use solana_sdk::poh_config::PohConfig;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::timing::timestamp;
+use solana_vote_api::vote_state::VoteState;
+use ctrlc::set_handler;
+
+
 
 use std::fs;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::mpsc::Receiver;
 use std::sync::{Arc, Mutex, RwLock};
 use std::thread::Result;
@@ -51,6 +55,7 @@ pub struct ValidatorConfig {
     pub snapshot_config: Option<SnapshotConfig>,
     pub max_ledger_slots: Option<u64>,
     pub broadcast_stage_type: BroadcastStageType,
+    pub enable_ctrl_c_handler: bool,
 }
 
 impl Default for ValidatorConfig {
@@ -67,6 +72,7 @@ impl Default for ValidatorConfig {
             rpc_config: JsonRpcConfig::default(),
             snapshot_config: None,
             broadcast_stage_type: BroadcastStageType::Standard,
+            enable_ctrl_c_handler: false,
         }
     }
 }
@@ -176,7 +182,32 @@ impl Validator {
             config.storage_slots_per_turn,
             bank.slots_per_segment(),
         );
-
+        if config. enable_ctrl_c_handler {
+            let bank_forks = bank_forks.clone();
+            let counter = Arc::new(AtomicUsize::new(0));
+            set_handler(move || {
+                if counter.fetch_add(1, Ordering::Relaxed) > 0 {
+                    warn!("Validator aborting on second ^C");
+                    std::process::exit(1);
+                }
+                let bank = bank_forks.read().unwrap().working_bank();
+                let stake: Option<u64> = bank
+                    .epoch_vote_accounts(bank.get_epoch_and_slot_index(bank.slot()).0) //Option<&HashMap<Pubkey, (u64, Account)>>
+                    .and_then(|account| {
+                        account.iter().find(|(pubkey, (stake, account))| {
+                            **pubkey == id
+                                && *stake > 0
+                                && VoteState::deserialize(&account.data).is_ok()
+                        })
+                    })
+                    .map(|(_, (n, _))| *n);
+                match stake {
+                    Some(_val) => warn!("Validator with stake is exiting on first ^C"),
+                    None => std::process::exit(1),
+                }
+            })
+            .expect("Error setting Ctrl-C handler");
+        }
         let rpc_service = if node.info.rpc.port() == 0 {
             None
         } else {

validator/src/lib.rs

@@ -457,7 +457,10 @@ pub fn main() {
 
     validator_config.voting_disabled = matches.is_present("no_voting");
 
+    validator_config.rpc_config.enable_fullnode_exit = matches.is_present("enable_rpc_exit");
+
     validator_config.rpc_config.enable_validator_exit = matches.is_present("enable_rpc_exit");
+    validator_config.enable_ctrl_c_handler = true;
 
     validator_config.rpc_config.drone_addr = matches.value_of("rpc_drone_addr").map(|address| {
         solana_netutil::parse_host_port(address).expect("failed to parse drone address")