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

Ignore errors when joining background threads for EAH tests (#28263)

This commit is contained in:
Brooks Prumo 2022-10-06 14:43:56 -04:00 committed by GitHub
parent 30b0a13ba9
commit 2d936784dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/tests/epoch_accounts_hash.rs
View File

@ -211,17 +211,11 @@ impl Drop for BackgroundServices {
info!("Stopping background services..."); info!("Stopping background services...");
self.exit.store(true, Ordering::Relaxed); self.exit.store(true, Ordering::Relaxed);
unsafe { ManuallyDrop::take(&mut self.accounts_background_service) } // Join the background threads, and ignore any errors.
.join() // SAFETY: We do not use any of the `ManuallyDrop` fields again, so `.take()` is OK here.
.expect("stop ABS"); _ = unsafe { ManuallyDrop::take(&mut self.accounts_background_service) }.join();
_ = unsafe { ManuallyDrop::take(&mut self.accounts_hash_verifier) }.join();
unsafe { ManuallyDrop::take(&mut self.accounts_hash_verifier) } _ = unsafe { ManuallyDrop::take(&mut self.snapshot_packager_service) }.join();
.join()
.expect("stop AHV");
unsafe { ManuallyDrop::take(&mut self.snapshot_packager_service) }
.join()
.expect("stop SPS");
info!("Stopping background services... DONE"); info!("Stopping background services... DONE");
} }