Fix data archives and restores failing on their own lock

startDataBackupRun already holds the backup run lock, but the archive
(createDataBackup) and restoreDataBackup took it again, so every run
failed a few seconds in with "Another backup or restore is already
running". The writer and the restore now take no lock of their own.

The run's notice (archiving, restoring, or why it failed) moves to its
own line under the actions row so the buttons don't shift, and archiving
reads in gray rather than the warning colour.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
2026-10-25 09:24:55 +01:00
co-authored by Claude Opus 5.5
parent 410d05e0b1
commit b9a49ee09c
11 changed files with 141 additions and 117 deletions
@@ -11,9 +11,17 @@ export type CreatedDataBackup = {
};
/**
* Writes one archive of the whole `DATA_DIR` and prunes the old ones.
* Callers already hold the backup run lock (`withBackupRunLock`), so a
* restore can take its safety copy without deadlocking on it.
* Writes one archive of the whole `DATA_DIR` (database, media, computer
* workspaces, bot and workspace files, MCP installs) into
* `BACKUP_ARCHIVE_DIR` and keeps only the newest `AppData.DataBackupsKept`.
* Every entry sits under one root folder named after the archive, so
* extracting it lands one folder. The SQLite file inside is only as
* consistent as the moment tar read it; `db/.backups` is for consistent
* snapshots.
*
* It takes no lock: callers run inside `startDataBackupRun`, which holds
* the backup run lock (`withBackupRunLock`) for the whole run, so the
* archive route and a restore's safety copy never take it twice.
*/
export default async function writeDataBackupArchive(): Promise<CreatedDataBackup> {
const { DATA_DIR } = grabDirNames();