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

Fix race in test of pg_switch_wal().

Browse Source 
The test failed when something added WAL between pg_switch_wal() and
pg_current_wal_lsn(), seen on buildfarm members hornet and sungazer.
Fix v10, v9.6 and v9.5 by making this code mirror its v13+ counterpart.
v12 and v11 lack a counterpart.
This commit is contained in:
Noah Misch 2020-09-13 23:13:44 -07:00
parent 1a9c93ec3b
commit e09391a0a0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/recovery/t/020_archive_status.pl
View File

@ -141,12 +141,14 @@ $primary->safe_psql(
'postgres', q{ 'postgres', q{
INSERT INTO mine SELECT generate_series(21,30) AS x; INSERT INTO mine SELECT generate_series(21,30) AS x;
CHECKPOINT; CHECKPOINT;
SELECT pg_switch_xlog();
}); });
# Make sure that the standby has caught here. # Switch to a new segment and use the returned LSN to make sure that the
my $primary_lsn = $primary->safe_psql('postgres', # standby has caught up to this point.
q{SELECT pg_current_xlog_location()}); my $primary_lsn = $primary->safe_psql(
'postgres', q{
SELECT pg_switch_xlog();
});
$standby1->poll_query_until('postgres', $standby1->poll_query_until('postgres',
qq{ SELECT pg_xlog_location_diff(pg_last_xlog_replay_location(), '$primary_lsn') >= 0 }) qq{ SELECT pg_xlog_location_diff(pg_last_xlog_replay_location(), '$primary_lsn') >= 0 })
or die "Timed out while waiting for xlog replay"; or die "Timed out while waiting for xlog replay";