EpochAccountsHash tests no longer ignore shutdown errors (#31883)
This commit is contained in:
parent
9220e53e23
commit
2fc1dc1bf6
|
@ -237,11 +237,16 @@ impl Drop for BackgroundServices {
|
||||||
info!("Stopping background services...");
|
info!("Stopping background services...");
|
||||||
self.exit.store(true, Ordering::Relaxed);
|
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.
|
// 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_background_service) }
|
||||||
_ = unsafe { ManuallyDrop::take(&mut self.accounts_hash_verifier) }.join();
|
.join()
|
||||||
_ = unsafe { ManuallyDrop::take(&mut self.snapshot_packager_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");
|
info!("Stopping background services... DONE");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue