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

If wait_for_catchup fails under has_wal_read_bug, skip balance of test. 

Test files should now ignore has_wal_read_bug() so long as
wait_for_catchup() is their only known way of reaching the bug.  That's
at least five files today, a number expected to grow over time.  This
commit removes skip logic from three.  By doing so, systems having the
bug regain the ability to catch other kinds of defects via those three
tests.  The other two, 002_databases.pl and 031_recovery_conflict.pl,
have been unprotected.  Back-patch to v15, where done_testing() first
became our standard.

Discussion: https://postgr.es/m/20221030031639.GA3082137@rfd.leadboat.com
This commit is contained in:
Noah Misch 2022-11-12 11:19:50 -08:00
parent 533e02e927
commit 30d98e14a8
4 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,13 +8,6 @@ use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils;
use Test::More;
if (PostgreSQL::Test::Utils::has_wal_read_bug)
{
# We'd prefer to use Test::More->builder->todo_start, but the bug causes
# this test file to die(), not merely to fail.
plan skip_all => 'filesystem bug';
}
my $node_primary;
my $node_standby;

19
src/test/perl/PostgreSQL/Test/Cluster.pm
View File

@ -2606,8 +2606,23 @@ sub wait_for_catchup
my $query = qq[SELECT '$target_lsn' <= ${mode}_lsn AND state = 'streaming'
FROM pg_catalog.pg_stat_replication
WHERE application_name IN ('$standby_name', 'walreceiver')];
$self->poll_query_until('postgres', $query)
or croak "timed out waiting for catchup";
if (!$self->poll_query_until('postgres', $query))
{
if (PostgreSQL::Test::Utils::has_wal_read_bug)
{
# Mimic having skipped the test file. If >0 tests have run, the
# harness won't accept a skip; otherwise, it won't accept
# done_testing(). Force a nonzero count by running one test.
ok(1, 'dummy test before skip for filesystem bug');
carp "skip rest: timed out waiting for catchup & filesystem bug";
done_testing();
exit 0;
}
else
{
croak "timed out waiting for catchup";
}
}
print "done\n";
return;
}

7
src/test/recovery/t/027_stream_regress.pl
View File

@ -6,13 +6,6 @@ use PostgreSQL::Test::Utils;
use Test::More;
use File::Basename;
if (PostgreSQL::Test::Utils::has_wal_read_bug)
{
# We'd prefer to use Test::More->builder->todo_start, but the bug causes
# this test file to die(), not merely to fail.
plan skip_all => 'filesystem bug';
}
# Initialize primary node
my $node_primary = PostgreSQL::Test::Cluster->new('primary');
$node_primary->init(allows_streaming => 1);

7
src/test/recovery/t/032_relfilenode_reuse.pl
View File

@ -5,13 +5,6 @@ use PostgreSQL::Test::Utils;
use Test::More;
use File::Basename;
if (PostgreSQL::Test::Utils::has_wal_read_bug)
{
# We'd prefer to use Test::More->builder->todo_start, but the bug causes
# this test file to die(), not merely to fail.
plan skip_all => 'filesystem bug';
}
my $node_primary = PostgreSQL::Test::Cluster->new('primary');
$node_primary->init(allows_streaming => 1);