Skip to content

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

FIX (backups): Fix deleting backups on storage change from joined storages

Rostislav Dugincbf502cae535
diff --git a/backend/internal/features/backups/backups/model.go b/backend/internal/features/backups/backups/model.go
index d09b215d..40c61f96 100644
--- a/backend/internal/features/backups/backups/model.go
+++ b/backend/internal/features/backups/backups/model.go
@@ -1,7 +1,6 @@
package backups
import (
- "log/slog"
"postgresus-backend/internal/features/databases"
"postgresus-backend/internal/features/storages"
"time"
@@ -27,16 +26,3 @@ type Backup struct {
CreatedAt time.Time `json:"createdAt" gorm:"column:created_at"`
}
-
-func (b *Backup) DeleteBackupFromStorage(logger *slog.Logger) {
- if b.Status != BackupStatusCompleted {
- return
- }
-
- err := b.Storage.DeleteFile(b.ID)
- if err != nil {
- logger.Error("Failed to delete backup from storage", "error", err)
- // we ignore the error, because the access to the storage
- // may be lost, file already deleted, etc.
- }
-}
diff --git a/backend/internal/features/backups/backups/service.go b/backend/internal/features/backups/backups/service.go
index cbb0aa17..8b676342 100644
--- a/backend/internal/features/backups/backups/service.go
+++ b/backend/internal/features/backups/backups/service.go
@@ -347,7 +347,15 @@ func (s *BackupService) deleteBackup(backup *Backup) error {
}
}
- backup.DeleteBackupFromStorage(s.logger)
+ storage, err := s.storageService.GetStorageByID(backup.StorageID)
+ if err != nil {
+ return err
+ }
+
+ err = storage.DeleteFile(backup.ID)
+ if err != nil {
+ return err
+ }
return s.backupRepository.DeleteByID(backup.ID)
}