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

Bump wal-g version to v3.0.0 #987

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Bump wal-g version to v3.0.0 #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb6217
Bump wal-g version to v3.0.0
hughcapet Mar 18, 2024
a3cb7a8
test
hughcapet Jun 26, 2024
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
2 changes: 1 addition & 1 deletion postgres-appliance/Dockerfile
View file
Open in desktop
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=v2.0.1
ENV WALG_VERSION=v3.0.0

COPY build_scripts/dependencies.sh /builddeps/

Expand Down
4 changes: 2 additions & 2 deletions postgres-appliance/bootstrap/clone_with_wale.py
View file
Open in desktop
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'^name\s+last_modified\s+', line) or re.match(r'^name\s+modified\s+', line)
started = re.match(r'^(backup_)?name\s+(last_)?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['name']
return match.get('name', match['backup_name'])


def list_backups(env):
Expand Down
2 changes: 1 addition & 1 deletion postgres-appliance/scripts/wale_restore.sh
View file
Open in desktop
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,/^name\s*\(last_\)\?modified\s*/d' | sort -bk2 | tail -n1 | awk '{print $3;}' | sed 's/_.*$//')
| sed '0,/^(backup_\)?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: 3 additions & 1 deletion postgres-appliance/tests/test_spilo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,9 @@ function test_spilo() {


# TEST SUITE 1
find_leader "$upgrade_container" # wait clone to finish and prevent timescale installation gets cloned
# wait clone to finish and prevent timescale installation gets cloned
find_leader "$upgrade_container"
find_leader "$upgrade3_container"
macedigital marked this conversation as resolved.
Show resolved Hide resolved

log_info "[TS1] Testing in-place major upgrade 11->13 with failing check"
create_timescaledb "$container" # we don't install it at the beginning, as we do 11->16 in a clone
Expand Down
Loading