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

Improve recently-added test reliability 

Commit 59be1c942a already tried to make
src/test/recovery/t/033_replay_tsp_drops more reliable, but it wasn't
enough.  Try to improve on that by making this use of a replication slot
to be more like others.  Also, don't drop the slot.

Make a few other stylistic changes while at it.  It's still quite slow,
which is another thing that we need to fix in this script.

Backpatch to all supported branches.

Discussion: https://postgr.es/m/349302.1659191875@sss.pgh.pa.us
This commit is contained in:
Alvaro Herrera 2022-08-06 15:52:10 +02:00
parent 6303df08f0
commit 6390bc740f
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/test/recovery/t/033_replay_tsp_drops.pl
View File

@ -9,6 +9,7 @@ use warnings;
use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils; use PostgreSQL::Test::Utils;
use Test::More; use Test::More;
use Time::HiRes qw(usleep);
sub test_tablespace sub test_tablespace
{ {
@ -36,14 +37,13 @@ sub test_tablespace
has_streaming => 1); has_streaming => 1);
$node_standby->append_conf('postgresql.conf', $node_standby->append_conf('postgresql.conf',
"allow_in_place_tablespaces = on"); "allow_in_place_tablespaces = on");
$node_standby->append_conf('postgresql.conf',
"primary_slot_name = slot");
$node_standby->start; $node_standby->start;
# Make sure connection is made # Make sure the connection is made
$node_primary->poll_query_until('postgres', $node_primary->wait_for_catchup($node_standby, 'write',
'SELECT count(*) = 1 FROM pg_stat_replication'); $node_primary->lsn('write'));
$node_primary->safe_psql('postgres', "SELECT pg_drop_replication_slot('slot')");
$node_standby->safe_psql('postgres', 'CHECKPOINT');
# Do immediate shutdown just after a sequence of CREATE DATABASE / DROP # Do immediate shutdown just after a sequence of CREATE DATABASE / DROP
# DATABASE / DROP TABLESPACE. This causes CREATE DATABASE WAL records # DATABASE / DROP TABLESPACE. This causes CREATE DATABASE WAL records
@ -62,10 +62,10 @@ sub test_tablespace
DROP TABLESPACE source_ts; DROP TABLESPACE source_ts;
DROP DATABASE template_db; DROP DATABASE template_db;
]; ];
$query =~ s/<STRATEGY>/$strategy/g; $query =~ s/<STRATEGY>/$strategy/g;
$node_primary->safe_psql('postgres', $query); $node_primary->safe_psql('postgres', $query);
$node_primary->wait_for_catchup($node_standby, 'replay', $node_primary->wait_for_catchup($node_standby, 'write',
$node_primary->lsn('write')); $node_primary->lsn('write'));
# show "create missing directory" log message # show "create missing directory" log message
@ -119,7 +119,7 @@ my $tspoid = $node_standby->safe_psql('postgres',
my $tspdir = $node_standby->data_dir . "/pg_tblspc/$tspoid"; my $tspdir = $node_standby->data_dir . "/pg_tblspc/$tspoid";
File::Path::rmtree($tspdir); File::Path::rmtree($tspdir);
my $logstart = get_log_size($node_standby); my $logstart = -s $node_standby->logfile;
# Create a database in the tablespace and a table in default tablespace # Create a database in the tablespace and a table in default tablespace
$node_primary->safe_psql( $node_primary->safe_psql(
@ -133,7 +133,7 @@ $node_primary->safe_psql(
# Standby should fail and should not silently skip replaying the wal # Standby should fail and should not silently skip replaying the wal
# In this test, PANIC turns into WARNING by allow_in_place_tablespaces. # In this test, PANIC turns into WARNING by allow_in_place_tablespaces.
# Check the log messages instead of confirming standby failure. # Check the log messages instead of confirming standby failure.
my $max_attempts = $PostgreSQL::Test::Utils::timeout_default; my $max_attempts = $PostgreSQL::Test::Utils::timeout_default * 10;
while ($max_attempts-- >= 0) while ($max_attempts-- >= 0)
{ {
last last
@ -141,31 +141,18 @@ while ($max_attempts-- >= 0)
find_in_log( find_in_log(
$node_standby, qr!WARNING: ( [A-Z0-9]+:)? creating missing directory: pg_tblspc/!, $node_standby, qr!WARNING: ( [A-Z0-9]+:)? creating missing directory: pg_tblspc/!,
$logstart)); $logstart));
sleep 1; usleep(100_000);
} }
ok($max_attempts > 0, "invalid directory creation is detected"); ok($max_attempts > 0, "invalid directory creation is detected");
done_testing(); done_testing();
# return the size of logfile of $node in bytes
sub get_log_size
{
my ($node) = @_;
return (stat $node->logfile)[7];
}
# find $pat in logfile of $node after $off-th byte # find $pat in logfile of $node after $off-th byte
sub find_in_log sub find_in_log
{ {
my ($node, $pat, $off) = @_; my ($node, $pat, $off) = @_;
$off = 0 unless defined $off; my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile, $off);
my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile);
return 0 if (length($log) <= $off);
$log = substr($log, $off);
return $log =~ m/$pat/; return $log =~ m/$pat/;
} }