From f1e065a448afd7a68afa3d54aef6f4cf2ad5c1d0 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:10:26 -0600
Subject: [PATCH] fix backup lock ordering (#1582)

---
 backend/src/backup/backup_bulk.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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