Skip to content

Fix recovery filter #7

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

Merged
alanbchristie merged 8 commits into from
Jan 27, 2026
Merged

Fix recovery filter #7

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53a1a45
fix: Fix recovery (s3 fuse)
Jan 26, 2026
ddf176c
fix: Fix "current user cannot be dropped" on recovery
Jan 27, 2026
8281c2c
fix: Fix recovery typo
Jan 27, 2026
8d22971
Merge branch 'pg15' into pg15-fix
alanbchristie Jan 27, 2026
ec2228f
fix: Fix for IF EXISTS
Jan 27, 2026
506ef98
Merge branch 'pg15' into pg15-fix
alanbchristie Jan 27, 2026
3e6d115
fix: Fix filter command
Jan 27, 2026
0f711d3
Merge branch 'pg15' into pg15-fix
alanbchristie Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions sql-recovery/recovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
# The recovery root dir, where backups are unpacked.
RECOVERY_ROOT_DIR = '/recovery'
DECOMPRESSED_RECOVERY_NAME = 'recovery'
DECOMPRESSED_FILTERED_NAME = 'filtered'
BACKUP_FILE_PREFIX = 'backup'

# Recovery commands for the various database flavours...
Expand Down Expand Up @@ -551,8 +552,9 @@ def error(error_no):
# cause the recovery to fail with "current user cannot be dropped".
# We only need to do this if the recovery is from a dumpall.
if not DATABASE:
TARGET_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_RECOVERY_NAME)
FILTER_PG_CMD = "egrep -v '^(CREATE|DROP) ROLE IF EXISTS %s;' %s > filtered.sql ; mv filtered.sql %s" % (RECOVERY_DATABASE_ROOT_USER, TARGET_FILE, TARGET_FILE)
RECOVERY_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_RECOVERY_NAME)
FILTERED_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_FILTERED_NAME)
FILTER_PG_CMD = "egrep -v '^(CREATE ROLE|DROP ROLE IF EXISTS) %s;' %s > %s ; mv %s %s" % (RECOVERY_DATABASE_ROOT_USER, RECOVERY_FILE, FILTERED_FILE, FILTERED_FILE, RECOVERY_FILE)
print(" $", FILTER_PG_CMD)
COMPLETED_PROCESS = subprocess.run(FILTER_PG_CMD,
shell=True,
Expand Down Expand Up @@ -626,6 +628,16 @@ def error(error_no):
print('--] OK - Found the expected number of databases (%s).'
% DATABASE_EXPECTED_COUNT)

# Remove any files we may have created.
RECOVERY_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_RECOVERY_NAME)
FILTERED_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_FILTERED_NAME)
if os.path.isfile(RECOVERY_FILE):
print('--] Removing %s' % RECOVERY_FILE)
os.remove(RECOVERY_FILE)
if os.path.isfile(FILTERED_FILE):
print('--] Removing %s' % FILTERED_FILE)
os.remove(FILTERED_FILE)

# Success if we get here
write_termination_message()

Expand Down