Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6bc6bd4

Browse files
committed
Fix instability in contrib/bloom TAP tests.
It turns out that the instability complained of in commit d3c09b9 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 7d1aa6b so that the test will actually get run. Discussion: https://postgr.es/m/2854602.1632852664@sss.pgh.pa.us
1 parent 07f8a9e commit 6bc6bd4

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

contrib/bloom/t/001_wal.pl

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ sub test_index_replay
1616
{
1717
my ($test_name) = @_;
1818

19+
local $Test::Builder::Level = $Test::Builder::Level + 1;
20+
1921
# Wait for standby to catch up
20-
my $applname = $node_standby->name;
21-
my $caughtup_query =
22-
"SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
23-
$node_primary->poll_query_until('postgres', $caughtup_query)
24-
or die "Timed out while waiting for standby 1 to catch up";
22+
$node_primary->wait_for_catchup($node_standby);
2523

2624
my $queries = qq(SET enable_seqscan=off;
2725
SET enable_bitmapscan=on;

0 commit comments

Comments
 (0)