Skip to content

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

FIX (backups): Save metadata file to storage before marking backup as COMPLETED to fix flaky test race condition

Rostislav Dugin18b81786084c
diff --git a/backend/internal/features/backups/backups/backuping/backuper.go b/backend/internal/features/backups/backups/backuping/backuper.go
index 5a98ed11..1343245c 100644
--- a/backend/internal/features/backups/backups/backuping/backuper.go
+++ b/backend/internal/features/backups/backups/backuping/backuper.go
@@ -280,7 +280,6 @@ func (n *BackuperNode) MakeBackup(backupID uuid.UUID, isCallNotifier bool) {
return
}
- backup.Status = backups_core.BackupStatusCompleted
backup.BackupDurationMs = time.Since(start).Milliseconds()
// Update backup with encryption metadata if provided
@@ -297,12 +296,6 @@ func (n *BackuperNode) MakeBackup(backupID uuid.UUID, isCallNotifier bool) {
backup.Encryption = backupMetadata.Encryption
}
- if err := n.backupRepository.Save(backup); err != nil {
- n.logger.Error("Failed to save backup", "error", err)
- return
- }
-
- // Save metadata file to storage
if backupMetadata != nil {
metadataJSON, err := json.Marshal(backupMetadata)
if err != nil {
@@ -335,6 +328,13 @@ func (n *BackuperNode) MakeBackup(backupID uuid.UUID, isCallNotifier bool) {
}
}
+ backup.Status = backups_core.BackupStatusCompleted
+
+ if err := n.backupRepository.Save(backup); err != nil {
+ n.logger.Error("Failed to save backup", "error", err)
+ return
+ }
+
// Update database last backup time
now := time.Now().UTC()
if updateErr := n.databaseService.SetLastBackupTime(databaseID, now); updateErr != nil {
diff --git a/backend/internal/features/backups/backups/controllers/controller_test.go b/backend/internal/features/backups/backups/controllers/controller_test.go
index 82b1edc9..360a1a89 100644
--- a/backend/internal/features/backups/backups/controllers/controller_test.go
+++ b/backend/internal/features/backups/backups/controllers/controller_test.go
@@ -17,6 +17,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
"databasus-backend/internal/config"
audit_logs "databasus-backend/internal/features/audit_logs"
@@ -1516,14 +1517,14 @@ func Test_MakeBackup_VerifyBackupAndMetadataFilesExistInStorage(t *testing.T) {
encryptor := encryption.GetFieldEncryptor()
backupFile, err := backupStorage.GetFile(encryptor, backup.FileName)
- assert.NoError(t, err)
+ require.NoError(t, err)
backupFile.Close()
metadataFile, err := backupStorage.GetFile(encryptor, backup.FileName+".metadata")
- assert.NoError(t, err)
+ require.NoError(t, err)
metadataContent, err := io.ReadAll(metadataFile)
- assert.NoError(t, err)
+ require.NoError(t, err)
metadataFile.Close()
var storageMetadata backups_common.BackupMetadata