From c9c299091ccae694a9c1d58c616407e55be53f6f Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Wed, 18 Aug 2021 11:43:53 +0900 Subject: [PATCH v1] Fix basebackup to generate correct WAL-Ranges info. While WAL-Ranges in backup_manifest is supposed to have the WAL range to apply at recovery. it actually starts from the beginning of the oldest timeline if the starting TLI > 1. As the result pg_verifybackup may result in a false failure for a valid backup. Adjust the logic to make WAL-Ranges start with the actual start LSN. Backpatch to PG13 where this feature has been introduced. --- src/backend/replication/backup_manifest.c | 10 +++++----- src/bin/pg_verifybackup/t/007_wal.pl | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/backend/replication/backup_manifest.c b/src/backend/replication/backup_manifest.c index 8882444025..d7a8584124 100644 --- a/src/backend/replication/backup_manifest.c +++ b/src/backend/replication/backup_manifest.c @@ -255,11 +255,11 @@ AddWALInfoToBackupManifest(backup_manifest_info *manifest, XLogRecPtr startptr, errmsg("expected end timeline %u but found timeline %u", starttli, entry->tli)); - if (!XLogRecPtrIsInvalid(entry->begin)) - tl_beginptr = entry->begin; - else - { + if (starttli == entry->tli) tl_beginptr = startptr; + else + { + tl_beginptr = entry->begin; /* * If we reach a TLI that has no valid beginning LSN, there can't @@ -267,7 +267,7 @@ AddWALInfoToBackupManifest(backup_manifest_info *manifest, XLogRecPtr startptr, * better have arrived at the expected starting TLI. If not, * something's gone horribly wrong. */ - if (starttli != entry->tli) + if (XLogRecPtrIsInvalid(entry->begin)) ereport(ERROR, errmsg("expected start timeline %u but found timeline %u", starttli, entry->tli)); diff --git a/src/bin/pg_verifybackup/t/007_wal.pl b/src/bin/pg_verifybackup/t/007_wal.pl index adf60fb755..bc52f0d1d9 100644 --- a/src/bin/pg_verifybackup/t/007_wal.pl +++ b/src/bin/pg_verifybackup/t/007_wal.pl @@ -10,7 +10,7 @@ use Config; use File::Path qw(rmtree); use PostgresNode; use TestLib; -use Test::More tests => 7; +use Test::More tests => 9; # Start up the server and take a backup. my $primary = PostgresNode->new('primary'); @@ -59,3 +59,19 @@ command_fails_like( [ 'pg_verifybackup', $backup_path ], qr/WAL parsing failed for timeline 1/, 'corrupt WAL file causes failure'); + +# +# Check that WAL-Ranges has the correct values when TLI > 1 +$primary->stop; +$primary->append_conf('standby.signal'); +$primary->start; +$primary->promote; +# base-backup runs a checkpoint but just to make sure. +$primary->safe_psql('postgres', 'SELECT pg_switch_wal(); CHECKPOINT;'); + +my $backup_path2 = $primary->backup_dir . '/test_tli'; +$primary->command_ok([ 'pg_basebackup', '-D', $backup_path2, '--no-sync' ], + "base backup 2 ok"); +# Should pass this case +command_ok([ 'pg_verifybackup', $backup_path2 ], + 'verifybackup should pass for a valid backup on timeline > 1'); -- 2.27.0