Skip to content

Commit ebdf0c0

Browse files
committed
prune scheduled backups first, so some non-scheduled regular backups might get another chance to survive
1 parent 79a7924 commit ebdf0c0

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

prime_backup/mcdr/task/backup/prune_backup_task.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,13 @@ def prune_backups(what: str, backup_filter: BackupFilter, setting: PruneSetting)
309309
result.deleted_backup_count += sub_result.deleted_backup_count
310310
result.deleted_blobs = result.deleted_blobs + sub_result.deleted_blobs
311311

312+
if not self.aborted_event.is_set():
313+
# prune scheduled backups first, so some non-scheduled regular backups might get another chance to survive
314+
prune_backups('scheduled', BackupFilter().requires_scheduled_backup(), config.scheduled_backup)
312315
if not self.aborted_event.is_set():
313316
prune_backups('regular', BackupFilter().requires_non_temporary_backup(), config.regular_backup)
314317
if not self.aborted_event.is_set():
315318
prune_backups('temporary', BackupFilter().requires_temporary_backup(), config.temporary_backup)
316-
if not self.aborted_event.is_set():
317-
prune_backups('scheduled', BackupFilter().requires_scheduled_backup(), config.scheduled_backup)
318319

319320
if self.verbose >= _PruneVerbose.delete:
320321
self.reply_tr(

0 commit comments

Comments
 (0)