Less scary logging of absent metadata (e.g. for WAL-E backups)

wal-g · Jun 11, 2022 · 0deb01d · 0deb01d
1 parent b8c17b1
commit 0deb01d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/docker/pg_tests/scripts/tests/wale_compatibility_test.sh b/docker/pg_tests/scripts/tests/wale_compatibility_test.sh
@@ -43,6 +43,7 @@ PGDATABASE=postgres \
 PGHOST=/var/run/postgresql \
 WALE_FILE_PREFIX=file://localhost/tmp \
 wal-e backup-push ${PGDATA}
+wal-e backup-push ${PGDATA}
 
 pkill -9 postgres
 
@@ -98,4 +99,6 @@ diff /tmp/dump1 /tmp/dump2
 rm -rf /tmp/conf_files
 /tmp/scripts/drop_pg.sh
 
+wal-g delete RETAIN 1 --confirm
+
 echo "WAL-E compatible backup-fetch success!!!!!!"
diff --git a/internal/backup_mark.go b/internal/backup_mark.go
@@ -198,8 +198,7 @@ func GetPermanentBackups(folder storage.Folder, metaFetcher GenericMetaFetcher)
 	for _, backupTime := range backupTimes {
 		meta, err := metaFetcher.Fetch(backupTime.BackupName, folder)
 		if err != nil {
-			tracelog.ErrorLogger.Printf("failed to fetch backup meta for backup %s with error %s, ignoring...",
-				backupTime.BackupName, err.Error())
+			PrintMetadataError(backupTime, err)
 			continue
 		}
 		if meta.IsPermanent {

diff --git a/internal/databases/postgres/delete_util.go b/internal/databases/postgres/delete_util.go
@@ -22,8 +22,7 @@ func GetPermanentBackupsAndWals(folder storage.Folder) (map[string]bool, map[str
 		backup := NewBackup(folder.GetSubFolder(utility.BaseBackupPath), backupTime.BackupName)
 		meta, err := backup.FetchMeta()
 		if err != nil {
-			tracelog.ErrorLogger.Printf("failed to fetch backup meta for backup %s with error %s, ignoring...",
-				backupTime.BackupName, err.Error())
+			internal.PrintMetadataNotFoundError(backupTime, err)
 			continue
 		}
 		if meta.IsPermanent {

diff --git a/internal/delete_util.go b/internal/delete_util.go
@@ -22,8 +22,7 @@ func FindPermanentBackups(folder storage.Folder, metaFetcher GenericMetaFetcher)
 		meta, err := metaFetcher.Fetch(
 			backupTime.BackupName, folder.GetSubFolder(utility.BaseBackupPath))
 		if err != nil {
-			tracelog.ErrorLogger.Printf("failed to fetch backup meta for backup %s with error %s, ignoring...",
-				backupTime.BackupName, err.Error())
+			PrintMetadataNotFoundError(backupTime, err)
 			continue
 		}
 		if meta.IsPermanent {
@@ -33,6 +32,16 @@ func FindPermanentBackups(folder storage.Folder, metaFetcher GenericMetaFetcher)
 	return permanentBackups
 }
 
+func PrintMetadataNotFoundError(backupTime BackupTime, err error) {
+	if _, ok := err.(storage.ObjectNotFoundError); ok {
+		tracelog.InfoLogger.Printf("Backup %s lacks metadata to check if it's permanent, ignoring...",
+			backupTime.BackupName)
+	} else {
+		tracelog.ErrorLogger.Printf("failed to fetch backup meta for backup %s with error %s, ignoring...",
+			backupTime.BackupName, err.Error())
+	}
+}
+
 // IsPermanent is a generic function to determine if the storage object is permanent.
 // It does not support permanent WALs or binlogs.
 func IsPermanent(objectName string, permanentBackups map[string]bool, backupNameLength int) bool {