Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix of deleting WAL-E backups #1292

Merged
merged 10 commits into from
Jun 15, 2022
Merged

Fix of deleting WAL-E backups #1292

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
895c3b0
Less scary logging of absent metadata (e.g. for WAL-E backups)
Jun 11, 2022
b0e0c3d
Add file prefix in WAL-E test
Jun 11, 2022
9e15742
Do two backups by WAL-E in tests
Jun 11, 2022
ed1d25a
Remove braces
Jun 11, 2022
0d35859
Just make 2 backups in WAL-E tests
Jun 11, 2022
66df9df
Fix delete subcommand in test
Jun 12, 2022
7158eee
Delete WAL-E backups before cleaning all files
Jun 12, 2022
cf95f9a
Adjust backup name pattern to account for WAL-E backups.
Jun 12, 2022
d745e60
Fatal on unknown error during meta fetch
Jun 13, 2022
690fb76
Rename function that handles metadata fetch error
Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions docker/pg_tests/scripts/tests/wale_compatibility_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,25 @@ PGHOST=/var/run/postgresql \
WALE_FILE_PREFIX=file://localhost/tmp \
wal-e backup-push ${PGDATA}

pgbench -i -s 10 postgres
pg_dumpall -f /tmp/dump1
pgbench -c 2 -T 100000000 -S &
sleep 1
AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE \
AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY \
AWS_ENDPOINT=http://s3:9000 \
AWS_S3_FORCE_PATH_STYLE=true \
WALG_COMPRESSION_METHOD=brotli \
WALG_DELTA_MAX_STEPS=6 \
WALG_UPLOAD_CONCURRENCY=10 \
WALG_DISK_RATE_LIMIT=41943040 \
WALG_NETWORK_RATE_LIMIT=10485760 \
PGSSLMODE=allow \
PGDATABASE=postgres \
PGHOST=/var/run/postgresql \
WALE_FILE_PREFIX=file://localhost/tmp \
wal-e backup-push ${PGDATA}

pkill -9 postgres

mkdir /tmp/conf_files
Expand Down Expand Up @@ -98,4 +117,7 @@ diff /tmp/dump1 /tmp/dump2
rm -rf /tmp/conf_files
/tmp/scripts/drop_pg.sh

WALE_FILE_PREFIX=file://localhost/tmp \
wal-g delete RETAIN 1 --confirm

echo "WAL-E compatible backup-fetch success!!!!!!"
3 changes: 1 addition & 2 deletions internal/backup_mark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
PrintMetadataNotFoundError(backupTime, err)
continue
}
if meta.IsPermanent {
Expand Down
3 changes: 1 addition & 2 deletions internal/databases/postgres/delete_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
13 changes: 11 additions & 2 deletions internal/delete_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -33,6 +32,16 @@ func FindPermanentBackups(folder storage.Folder, metaFetcher GenericMetaFetcher)
return permanentBackups
}

func PrintMetadataNotFoundError(backupTime BackupTime, err error) {
x4m marked this conversation as resolved.
Show resolved Hide resolved
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 {
Expand Down