1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In tests, await an LSN no later than the recovery target.

Browse Source 
Otherwise, the test fails with "Timed out while waiting for standby to
catch up".  This happened rarely, perhaps only when autovacuum wrote WAL
between our choosing the recovery target and choosing the LSN to await.
Commit b26f7fa6ae2b4e5d64525b3d5bc66a0ddccd9e24 fixed one case of this.
Fix two more.  Back-patch to 9.6, which introduced the affected test.

Discussion: https://postgr.es/m/20180101055227.GA2952815@rfd.leadboat.com
This commit is contained in:
Noah Misch 2017-12-31 21:58:29 -08:00
parent bd29bc417e
commit f9c1c60995
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/recovery/t/003_recovery_targets.pl
View File

@ -5,8 +5,9 @@ use PostgresNode;
use TestLib; use TestLib;
use Test::More tests => 7; use Test::More tests => 7;
# Create and test a standby from given backup, with a certain # Create and test a standby from given backup, with a certain recovery target.
# recovery target. # Choose $until_lsn later than the transaction commit that causes the row
# count to reach $num_rows, yet not later than the recovery target.
sub test_recovery_standby sub test_recovery_standby
{ {
my $test_name = shift; my $test_name = shift;
@ -73,9 +74,9 @@ my ($lsn2, $recovery_txid) = split /\|/, $ret;
# More data, with recovery target timestamp # More data, with recovery target timestamp
$node_master->safe_psql('postgres', $node_master->safe_psql('postgres',
"INSERT INTO tab_int VALUES (generate_series(2001,3000))"); "INSERT INTO tab_int VALUES (generate_series(2001,3000))");
$ret = $node_master->safe_psql('postgres', my $lsn3 =
"SELECT pg_current_xlog_location(), now();"); $node_master->safe_psql('postgres', "SELECT pg_current_xlog_location();");
my ($lsn3, $recovery_time) = split /\|/, $ret; my $recovery_time = $node_master->safe_psql('postgres', "SELECT now()");
# Even more data, this time with a recovery target name # Even more data, this time with a recovery target name
$node_master->safe_psql('postgres', $node_master->safe_psql('postgres',