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

Revert "EpochAccountsHash tests no longer ignore shutdown errors (#31883)" (#32018) 

This reverts commit 2fc1dc1bf6.
This commit is contained in:
Brooks 2023-06-07 16:44:46 -04:00 committed by GitHub
parent ddbc35fcc3
commit 8596e00549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/tests/epoch_accounts_hash.rs
View File

@ -237,16 +237,11 @@ 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()
.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");
_ = 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();
info!("Stopping background services... DONE");
}