rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix instability in contrib/bloom TAP tests. 

It turns out that the instability complained of in commit d3c09b9b1
has an embarrassingly simple explanation.  The test script waits for
the standby to flush incoming WAL to disk, but it should wait for
the WAL to be replayed, since we are testing for the effects of that
to be visible.

While at it, use wait_for_catchup instead of reinventing that logic,
and adjust $Test::Builder::Level to improve future error reports.

Back-patch to v12 where the necessary infrastructure came in
(cf. aforesaid commit).  Also back-patch 7d1aa6bf1 so that the
test will actually get run.

Discussion: https://postgr.es/m/2854602.1632852664@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2021-09-28 17:34:31 -04:00
parent b7647c4260
commit 2d8a8b18fe
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/bloom/Makefile
View File

@ -9,9 +9,7 @@ PGFILEDESC = "bloom access method - signature file based index"
REGRESS = bloom
# Disable TAP tests for this module for now, as these are unstable on several
# buildfarm environments.
# TAP_TESTS = 1
TAP_TESTS = 1
ifdef USE_PGXS
PG_CONFIG = pg_config

8
contrib/bloom/t/001_wal.pl
View File

@ -13,12 +13,10 @@ sub test_index_replay
{
my ($test_name) = @_;
local $Test::Builder::Level = $Test::Builder::Level + 1;
# Wait for standby to catch up
my $applname = $node_standby->name;
my $caughtup_query =
"SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
$node_master->poll_query_until('postgres', $caughtup_query)
or die "Timed out while waiting for standby 1 to catch up";
$node_master->wait_for_catchup($node_standby);
my $queries = qq(SET enable_seqscan=off;
SET enable_bitmapscan=on;