Rename ValidatorExit and move to sdk (#17728)
This commit is contained in:
@ -5,8 +5,11 @@ use {
|
||||
jsonrpc_ipc_server::{RequestContext, ServerBuilder},
|
||||
jsonrpc_server_utils::tokio,
|
||||
log::*,
|
||||
solana_core::validator::{ValidatorExit, ValidatorStartProgress},
|
||||
solana_sdk::signature::{read_keypair_file, Keypair, Signer},
|
||||
solana_core::validator::ValidatorStartProgress,
|
||||
solana_sdk::{
|
||||
exit::Exit,
|
||||
signature::{read_keypair_file, Keypair, Signer},
|
||||
},
|
||||
std::{
|
||||
net::SocketAddr,
|
||||
path::Path,
|
||||
@ -21,7 +24,7 @@ pub struct AdminRpcRequestMetadata {
|
||||
pub rpc_addr: Option<SocketAddr>,
|
||||
pub start_time: SystemTime,
|
||||
pub start_progress: Arc<RwLock<ValidatorStartProgress>>,
|
||||
pub validator_exit: Arc<RwLock<ValidatorExit>>,
|
||||
pub validator_exit: Arc<RwLock<Exit>>,
|
||||
pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
|
||||
}
|
||||
impl Metadata for AdminRpcRequestMetadata {}
|
||||
@ -67,7 +70,7 @@ impl AdminRpc for AdminRpcImpl {
|
||||
warn!("validator exit requested");
|
||||
meta.validator_exit.write().unwrap().exit();
|
||||
|
||||
// TODO: Debug why ValidatorExit doesn't always cause the validator to fully exit
|
||||
// TODO: Debug why Exit doesn't always cause the validator to fully exit
|
||||
// (rocksdb background processing or some other stuck thread perhaps?).
|
||||
//
|
||||
// If the process is still alive after five seconds, exit harder
|
||||
|
@ -6,7 +6,8 @@ use {
|
||||
},
|
||||
solana_core::validator::ValidatorStartProgress,
|
||||
solana_sdk::{
|
||||
clock::Slot, commitment_config::CommitmentConfig, native_token::Sol, pubkey::Pubkey,
|
||||
clock::Slot, commitment_config::CommitmentConfig, exit::Exit, native_token::Sol,
|
||||
pubkey::Pubkey,
|
||||
},
|
||||
std::{
|
||||
io,
|
||||
@ -31,7 +32,7 @@ impl Dashboard {
|
||||
pub fn new(
|
||||
ledger_path: &Path,
|
||||
log_path: Option<&Path>,
|
||||
validator_exit: Option<&mut solana_core::validator::ValidatorExit>,
|
||||
validator_exit: Option<&mut Exit>,
|
||||
) -> Result<Self, io::Error> {
|
||||
println_name_value("Ledger location:", &format!("{}", ledger_path.display()));
|
||||
if let Some(log_path) = log_path {
|
||||
|
Reference in New Issue
Block a user