Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix backup lock ordering (#1582)

Browse Source
This commit is contained in:
Aiden McClelland
2022-06-28 15:10:26 -06:00
committed by GitHub
parent c82c6eaf34
commit f1e065a448
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/backup/backup_bulk.rs
View File

@@ -159,7 +159,6 @@ pub async fn backup_all(
} }
let revision = assure_backing_up(&mut db, &service_ids).await?; let revision = assure_backing_up(&mut db, &service_ids).await?;
tokio::task::spawn(async move { tokio::task::spawn(async move {
let backup_res = perform_backup(&ctx, &mut db, backup_guard).await;
let backup_progress = crate::db::DatabaseModel::new() let backup_progress = crate::db::DatabaseModel::new()
.server_info() .server_info()
.status_info() .status_info()
@@ -169,6 +168,7 @@ pub async fn backup_all(
.lock(&mut db, LockType::Write) .lock(&mut db, LockType::Write)
.await .await
.expect("failed to lock server status"); .expect("failed to lock server status");
let backup_res = perform_backup(&ctx, &mut db, backup_guard).await;
match backup_res { match backup_res {
Ok(report) if report.iter().all(|(_, rep)| rep.error.is_none()) => ctx Ok(report) if report.iter().all(|(_, rep)| rep.error.is_none()) => ctx
.notification_manager .notification_manager