From 2fc1dc1bf6cfc8901fa521c453d9d9b7ab64db3d Mon Sep 17 00:00:00 2001 From: Brooks Date: Wed, 31 May 2023 09:11:06 -0400 Subject: [PATCH] EpochAccountsHash tests no longer ignore shutdown errors (#31883) --- core/tests/epoch_accounts_hash.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/core/tests/epoch_accounts_hash.rs b/core/tests/epoch_accounts_hash.rs index 51809cfb6..f88981c34 100755 --- a/core/tests/epoch_accounts_hash.rs +++ b/core/tests/epoch_accounts_hash.rs @@ -237,11 +237,16 @@ impl Drop for BackgroundServices { info!("Stopping background services..."); self.exit.store(true, Ordering::Relaxed); - // Join the background threads, and ignore any errors. // SAFETY: We do not use any of the `ManuallyDrop` fields again, so `.take()` is OK here. - _ = unsafe { ManuallyDrop::take(&mut self.accounts_background_service) }.join(); - _ = unsafe { ManuallyDrop::take(&mut self.accounts_hash_verifier) }.join(); - _ = unsafe { ManuallyDrop::take(&mut self.snapshot_packager_service) }.join(); + unsafe { ManuallyDrop::take(&mut self.accounts_background_service) } + .join() + .expect("stop AccountsBackgroundService"); + unsafe { ManuallyDrop::take(&mut self.accounts_hash_verifier) } + .join() + .expect("stop AccountsHashVerifier"); + unsafe { ManuallyDrop::take(&mut self.snapshot_packager_service) } + .join() + .expect("stop SnapshotPackagerService"); info!("Stopping background services... DONE"); }