blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Eradicate zombie RPC threads (#31688) 

* Ensure jsonrpc server has closed when joining rpc_service thread

* Use same exit bool as other services

* Remove redundant registered exit line
This commit is contained in:
Tyera 2023-05-16 21:09:44 -06:00 committed by GitHub
parent b422ac0368
commit 2cdb43ff1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/validator.rs
View File

@ -930,6 +930,7 @@ impl Validator {
genesis_config.hash(), genesis_config.hash(),
ledger_path, ledger_path,
config.validator_exit.clone(), config.validator_exit.clone(),
exit.clone(),
config.known_validators.clone(), config.known_validators.clone(),
rpc_override_health_check.clone(), rpc_override_health_check.clone(),
startup_verification_complete, startup_verification_complete,

7
rpc/src/rpc_service.rs
View File

@ -349,6 +349,7 @@ impl JsonRpcService {
genesis_hash: Hash, genesis_hash: Hash,
ledger_path: &Path, ledger_path: &Path,
validator_exit: Arc<RwLock<Exit>>, validator_exit: Arc<RwLock<Exit>>,
exit: Arc<AtomicBool>,
known_validators: Option<HashSet<Pubkey>>, known_validators: Option<HashSet<Pubkey>>,
override_health_check: Arc<AtomicBool>, override_health_check: Arc<AtomicBool>,
startup_verification_complete: Arc<AtomicBool>, startup_verification_complete: Arc<AtomicBool>,
@ -476,7 +477,6 @@ impl JsonRpcService {
prioritization_fee_cache, prioritization_fee_cache,
); );
let exit = Arc::new(AtomicBool::new(false));
let leader_info = let leader_info =
poh_recorder.map(|recorder| ClusterTpuInfo::new(cluster_info.clone(), recorder)); poh_recorder.map(|recorder| ClusterTpuInfo::new(cluster_info.clone(), recorder));
let _send_transaction_service = Arc::new(SendTransactionService::new_with_config( let _send_transaction_service = Arc::new(SendTransactionService::new_with_config(
@ -560,7 +560,6 @@ impl JsonRpcService {
.unwrap() .unwrap()
.register_exit(Box::new(move || { .register_exit(Box::new(move || {
close_handle_.close(); close_handle_.close();
exit.store(true, Ordering::Relaxed);
})); }));
Ok(Self { Ok(Self {
thread_hdl, thread_hdl,
@ -576,7 +575,8 @@ impl JsonRpcService {
} }
} }
pub fn join(self) -> thread::Result<()> { pub fn join(mut self) -> thread::Result<()> {
self.exit();
self.thread_hdl.join() self.thread_hdl.join()
} }
} }
@ -642,6 +642,7 @@ mod tests {
Hash::default(), Hash::default(),
&PathBuf::from("farf"), &PathBuf::from("farf"),
validator_exit, validator_exit,
exit,
None, None,
Arc::new(AtomicBool::new(false)), Arc::new(AtomicBool::new(false)),
Arc::new(AtomicBool::new(true)), Arc::new(AtomicBool::new(true)),