rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-07-08 14:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

use Tenant::shutdown

Browse Source 
Signed-off-by: Alex Chi Z <chi@neon.tech>
This commit is contained in:
Alex Chi Z
2023-07-21 16:18:00 -04:00
parent 5f8bd41725
commit 7b4251e9b5
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pageserver/src/tenant/mgr.rs
View File

@@ -16,7 +16,7 @@ use tokio::task::JoinSet;
use tracing::*;
use remote_storage::GenericRemoteStorage;
use utils::crashsafe;
use utils::{completion, crashsafe};
use crate::config::PageServerConf;
use crate::context::{DownloadBehavior, RequestContext};
@@ -385,9 +385,12 @@ pub async fn create_tenant(
};
if let Err(e) = check() {
// schedule_local_tenant_processing eventually launches the tenant's background task
// We need to shut them down before bailing out.
created_tenant.set_broken("failed to create".into()).await;
// `schedule_local_tenant_processing` eventually launches the tenant's background task
// We need to shut them down before bailing out. Shutdown the tenant in the background.
tokio::spawn(async move {
let (_guard, shutdown_progress) = completion::channel();
created_tenant.shutdown(shutdown_progress, false).await
});
return Err(e);
}
@@ -648,9 +651,12 @@ pub async fn attach_tenant(
};
if let Err(e) = check() {
// schedule_local_tenant_processing eventually launches the tenant's background task
// We need to shut them down before bailing out.
attached_tenant.set_broken("failed to create".into()).await;
// `schedule_local_tenant_processing` eventually launches the tenant's background task
// We need to shut them down before bailing out. Shutdown the tenant in the background.
tokio::spawn(async move {
let (_guard, shutdown_progress) = completion::channel();
attached_tenant.shutdown(shutdown_progress, false).await
});
return Err(e);
}