Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (backups): Do not allow 2 parallel backups for the same DB

Rostislav Dugin7d9ecf697bd6
diff --git a/backend/internal/features/backups/backups/backuping/scheduler.go b/backend/internal/features/backups/backups/backuping/scheduler.go
index c67959ac..deb9f789 100644
--- a/backend/internal/features/backups/backups/backuping/scheduler.go
+++ b/backend/internal/features/backups/backups/backuping/scheduler.go
@@ -166,6 +166,33 @@ func (s *BackupsScheduler) StartBackup(databaseID uuid.UUID, isCallNotifier bool
return
}
+ // Check for existing in-progress backups
+ inProgressBackups, err := s.backupRepository.FindByDatabaseIdAndStatus(
+ databaseID,
+ backups_core.BackupStatusInProgress,
+ )
+ if err != nil {
+ s.logger.Error(
+ "Failed to check for in-progress backups",
+ "databaseId",
+ databaseID,
+ "error",
+ err,
+ )
+ return
+ }
+
+ if len(inProgressBackups) > 0 {
+ s.logger.Warn(
+ "Backup already in progress for database, skipping new backup",
+ "databaseId",
+ databaseID,
+ "existingBackupId",
+ inProgressBackups[0].ID,
+ )
+ return
+ }
+
leastBusyNodeID, err := s.calculateLeastBusyNode()
if err != nil {
s.logger.Error(
diff --git a/backend/internal/features/backups/backups/backuping/scheduler_test.go b/backend/internal/features/backups/backups/backuping/scheduler_test.go
index aef14429..b3e8b6f3 100644
--- a/backend/internal/features/backups/backups/backuping/scheduler_test.go
+++ b/backend/internal/features/backups/backups/backuping/scheduler_test.go
@@ -1033,3 +1033,71 @@ func Test_StartBackup_WhenBackupFails_DecrementsActiveTaskCount(t *testing.T) {
time.Sleep(200 * time.Millisecond)
}
+
+func Test_StartBackup_WhenBackupAlreadyInProgress_SkipsNewBackup(t *testing.T) {
+ cache_utils.ClearAllCache()
+ backuperNode := CreateTestBackuperNode()
+ cancel := StartBackuperNodeForTest(t, backuperNode)
+ defer StopBackuperNodeForTest(t, cancel, backuperNode)
+
+ user := users_testing.CreateTestUser(users_enums.UserRoleAdmin)
+ router := CreateTestRouter()
+ workspace := workspaces_testing.CreateTestWorkspace("Test Workspace", user, router)
+ storage := storages.CreateTestStorage(workspace.ID)
+ notifier := notifiers.CreateTestNotifier(workspace.ID)
+ database := databases.CreateTestDatabase(workspace.ID, storage, notifier)
+
+ defer func() {
+ backups, _ := backupRepository.FindByDatabaseID(database.ID)
+ for _, backup := range backups {
+ backupRepository.DeleteByID(backup.ID)
+ }
+
+ databases.RemoveTestDatabase(database)
+ time.Sleep(50 * time.Millisecond)
+ storages.RemoveTestStorage(storage.ID)
+ notifiers.RemoveTestNotifier(notifier)
+ workspaces_testing.RemoveTestWorkspace(workspace, router)
+ }()
+
+ backupConfig, err := backups_config.GetBackupConfigService().GetBackupConfigByDbId(database.ID)
+ assert.NoError(t, err)
+
+ timeOfDay := "04:00"
+ backupConfig.BackupInterval = &intervals.Interval{
+ Interval: intervals.IntervalDaily,
+ TimeOfDay: &timeOfDay,
+ }
+ backupConfig.IsBackupsEnabled = true
+ backupConfig.StorePeriod = period.PeriodWeek
+ backupConfig.Storage = storage
+ backupConfig.StorageID = &storage.ID
+
+ _, err = backups_config.GetBackupConfigService().SaveBackupConfig(backupConfig)
+ assert.NoError(t, err)
+
+ // Create an in-progress backup manually
+ inProgressBackup := &backups_core.Backup{
+ DatabaseID: database.ID,
+ StorageID: storage.ID,
+ Status: backups_core.BackupStatusInProgress,
+ BackupSizeMb: 0,
+ CreatedAt: time.Now().UTC(),
+ }
+ err = backupRepository.Save(inProgressBackup)
+ assert.NoError(t, err)
+
+ // Try to start a new backup - should be skipped
+ GetBackupsScheduler().StartBackup(database.ID, false)
+
+ time.Sleep(200 * time.Millisecond)
+
+ // Verify only 1 backup exists (the original in-progress one)
+ backups, err := backupRepository.FindByDatabaseID(database.ID)
+ assert.NoError(t, err)
+ assert.Len(t, backups, 1)
+ assert.Equal(t, backups_core.BackupStatusInProgress, backups[0].Status)
+ assert.Equal(t, inProgressBackup.ID, backups[0].ID)
+
+ time.Sleep(200 * time.Millisecond)
+}