Skip to content

Commit

Permalink
Revert "Bump wal-g version to v3.0.0 (zalando#987)"
Browse files Browse the repository at this point in the history
This reverts commit 5f69a19.

There currently is an open bug in wal-g which breaks archiving backups
to S3 when using AssumeRole on AWS: zalando#1009

Revert to a functioning version of wal-g,  until the issue has been
resolved.
  • Loading branch information
Jasper-Ben committed Jan 20, 2025
1 parent 4b3d1c6 commit db70652
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion postgres-appliance/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM $BASE_IMAGE as dependencies-builder

ARG DEMO

ENV WALG_VERSION=v3.0.3
ENV WALG_VERSION=v2.0.1

COPY build_scripts/dependencies.sh /builddeps/

Expand Down
4 changes: 2 additions & 2 deletions postgres-appliance/bootstrap/clone_with_wale.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def fix_output(output):
started = None
for line in output.decode('utf-8').splitlines():
if not started:
started = re.match(r'^(backup_)?name\s+(last_)?modified\s+', line)
started = re.match(r'^name\s+last_modified\s+', line) or re.match(r'^name\s+modified\s+', line)
if started:
line = line.replace(' modified ', ' last_modified ')
if started:
Expand All @@ -75,7 +75,7 @@ def choose_backup(backup_list, recovery_target_time):
match = backup
match_timestamp = last_modified
if match is not None:
return match.get('name', match['backup_name'])
return match['name']


def list_backups(env):
Expand Down
2 changes: 1 addition & 1 deletion postgres-appliance/scripts/wale_restore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ATTEMPT=0
server_version="-1"
while true; do
[[ -z $wal_segment_backup_start ]] && wal_segment_backup_start=$($WAL_E backup-list 2> /dev/null \
| sed '0,/^\(backup_\)\?name\s*\(last_\)\?modified\s*/d' | sort -bk2 | tail -n1 | awk '{print $3;}' | sed 's/_.*$//')
| sed '0,/^name\s*\(last_\)\?modified\s*/d' | sort -bk2 | tail -n1 | awk '{print $3;}' | sed 's/_.*$//')

[[ -n "$CONNSTR" && $server_version == "-1" ]] && server_version=$(psql -d "$CONNSTR" -tAc 'show server_version_num' 2> /dev/null || echo "-1")

Expand Down
4 changes: 1 addition & 3 deletions postgres-appliance/tests/test_spilo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,7 @@ function test_spilo() {


# TEST SUITE 1
# wait clone to finish and prevent timescale installation gets cloned
find_leader "$upgrade3_container"
find_leader "$upgrade_container"
find_leader "$upgrade_container" # wait clone to finish and prevent timescale installation gets cloned
create_timescaledb "$container" # we don't install it at the beginning, as we do 13->17 in a clone

log_info "[TS1] Testing in-place major upgrade 13->14"
Expand Down

0 comments on commit db70652

Please sign in to comment.