rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-10-16 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

pageserver: warn on unexpected refs to Tenant after shutdown

Browse Source 
This should help to validate that our shutdown logic is working
the way we expect.
This commit is contained in:
John Spray
2023-08-03 15:44:14 +01:00
parent df49a9b7aa
commit 2fe454238d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pageserver/src/tenant/mgr.rs
+11 -1
View File
@@ -274,12 +274,15 @@ async fn shutdown_all_tenants0(tenants: &tokio::sync::RwLock<TenantsMap>) {
let ordering = std::sync::atomic::Ordering::Relaxed;
let joined_other = std::sync::atomic::AtomicBool::new(false);
let tenant_weak = Arc::downgrade(&tenant);
let mut shutdown = std::pin::pin!(async {
let freeze_and_flush = true;
let res = {
let (_guard, shutdown_progress) = completion::channel();
tenant.shutdown(shutdown_progress, freeze_and_flush).await
// Always safe to upgrade this weak ptr, because the outer code block
// holds an Arc to it past the point it awaits this async block.
tenant_weak.upgrade().unwrap().shutdown(shutdown_progress, freeze_and_flush).await
};
if let Err(other_progress) = res {
@@ -304,6 +307,13 @@ async fn shutdown_all_tenants0(tenants: &tokio::sync::RwLock<TenantsMap>) {
}
};
// Shutdown should have stopped all the background tasks that referenced
// the tenant: when we drop our ref it should drop the Tenant. If that isn't
// the case it's a bug.
if Arc::into_inner(tenant).is_none() {
warn!("Tenant still has references after shutdown");
}
debug!("tenant successfully stopped");
}
.instrument(info_span!("shutdown", %tenant_id)),