From af1a2e83bce2c1b99128ca3508a69920b72a9f38 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Sat, 28 Jul 2018 16:28:55 -0700 Subject: [PATCH] Don't panic again when waiting for a panicked validator thread --- src/bin/bench-tps.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bin/bench-tps.rs b/src/bin/bench-tps.rs index 2ec96d4c54..971ee88cad 100644 --- a/src/bin/bench-tps.rs +++ b/src/bin/bench-tps.rs @@ -563,13 +563,20 @@ fn main() { // Stop the sampling threads so it will collect the stats exit_signal.store(true, Ordering::Relaxed); + + println!("Waiting for validator threads..."); for t in v_threads { - t.join().unwrap(); + if let Err(err) = t.join() { + println!(" join() failed with: {:?}", err); + } } // join the tx send threads + println!("Waiting for transmit threads..."); for t in s_threads { - t.join().unwrap(); + if let Err(err) = t.join() { + println!(" join() failed with: {:?}", err); + } } let balance = client.poll_get_balance(&id.pubkey()).unwrap_or(-1);