gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wait for monitor threads to exit before Blocktree destruction

Browse Source
This commit is contained in:
Michael Vines
2019-02-13 10:10:46 -08:00
parent ddc8bfed29
commit 6187779d10
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/multinode.rs
View File

@ -1884,6 +1884,7 @@ fn test_fullnode_rotate(ticks_per_slot: u64, slots_per_epoch: u64, include_valid
// Start up the node(s) // Start up the node(s)
let mut node_exits = vec![]; let mut node_exits = vec![];
let mut monitor_threads = vec![];
if include_validator { if include_validator {
let validator_ledger_path = tmp_copy_ledger( let validator_ledger_path = tmp_copy_ledger(
@ -1906,7 +1907,7 @@ fn test_fullnode_rotate(ticks_per_slot: u64, slots_per_epoch: u64, include_valid
let mut validator_tick_height_of_next_rotation = tick_height_of_next_rotation; let mut validator_tick_height_of_next_rotation = tick_height_of_next_rotation;
let mut validator_should_be_leader = !should_be_leader; let mut validator_should_be_leader = !should_be_leader;
Builder::new() let monitor_thread = Builder::new()
.name("validator_rotation_receiver".to_string()) .name("validator_rotation_receiver".to_string())
.spawn(move || loop { .spawn(move || loop {
match validator_rotation_receiver.recv() { match validator_rotation_receiver.recv() {
@ -1932,6 +1933,7 @@ fn test_fullnode_rotate(ticks_per_slot: u64, slots_per_epoch: u64, include_valid
}; };
}) })
.unwrap(); .unwrap();
monitor_threads.push(monitor_thread);
} }
let (leader_rotation_sender, leader_rotation_receiver) = channel(); let (leader_rotation_sender, leader_rotation_receiver) = channel();
@ -1986,9 +1988,12 @@ fn test_fullnode_rotate(ticks_per_slot: u64, slots_per_epoch: u64, include_valid
node_exit(); node_exit();
} }
for monitor_thread in monitor_threads {
monitor_thread.join().unwrap();
}
for path in ledger_paths { for path in ledger_paths {
Blocktree::destroy(&path) Blocktree::destroy(&path).unwrap();
.unwrap_or_else(|err| warn!("Expected successful database destruction: {:?}", err));
remove_dir_all(path).unwrap(); remove_dir_all(path).unwrap();
} }
} }