rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 12:01:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor routine to find single log content pattern in TAP tests

Browse Source 
The same routine to check if a specific pattern can be found in the
server logs was copied over four different test scripts.  This refactors
the whole to use a single routine located in PostgreSQL::Test::Cluster,
named log_contains, to grab the contents of the server logs and check
for a specific pattern.

On HEAD, the code previously used assumed that slurp_file() could not
handle an undefined offset, setting it to zero, but slurp_file() does
do an extra fseek() before retrieving the log contents only if an offset
is defined.  In two places, the test was retrieving the full log
contents with slurp_file() after calling substr() to apply an offset,
ignoring that slurp_file() would be able to handle that.

Backpatch all the way down to ease the introduction of new tests that
could rely on the new routine.

Author: Vignesh C
Reviewed-by: Andrew Dunstan, Dagfinn Ilmari Mannsåker, Michael Paquier
Discussion: https://postgr.es/m/CALDaNm0YSiLpjCmajwLfidQrFOrLNKPQir7s__PeVvh9U3uoTQ@mail.gmail.com
Backpatch-through: 11
This commit is contained in:
Michael Paquier 2023-06-09 11:56:33 +09:00
parent 7fa7911c76
commit e25e5f7fc6
3 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2569,6 +2569,21 @@ sub log_check
=pod
=item log_contains(pattern, offset)
Find pattern in logfile of node after offset byte.
=cut
sub log_contains
{
my ($self, $pattern, $offset) = @_;
return PostgreSQL::Test::Utils::slurp_file($self->logfile, $offset) =~ m/$pattern/;
}
=pod
=item $node->run_log(...)
Runs a shell command like PostgreSQL::Test::Utils::run_log, but with connection parameters set

31
src/test/recovery/t/019_replslot_limit.pl
View File

@ -163,8 +163,7 @@ $node_primary->wait_for_catchup($node_standby);
$node_standby->stop;
ok( !find_in_log(
$node_standby,
ok( !$node_standby->log_contains(
"requested WAL segment [0-9A-F]+ has already been removed"),
'check that required WAL segments are still available');
@ -186,8 +185,7 @@ $node_primary->safe_psql('postgres', "CHECKPOINT;");
my $invalidated = 0;
for (my $i = 0; $i < 10000; $i++)
{
if (find_in_log(
$node_primary,
if ($node_primary->log_contains(
"invalidating slot \"rep1\" because its restart_lsn [0-9A-F/]+ exceeds max_slot_wal_keep_size",
$logstart))
{
@ -210,7 +208,7 @@ is($result, "rep1|f|t|lost|",
my $checkpoint_ended = 0;
for (my $i = 0; $i < 10000; $i++)
{
if (find_in_log($node_primary, "checkpoint complete: ", $logstart))
if ($node_primary->log_contains("checkpoint complete: ", $logstart))
{
$checkpoint_ended = 1;
last;
@ -240,8 +238,7 @@ $node_standby->start;
my $failed = 0;
for (my $i = 0; $i < 10000; $i++)
{
if (find_in_log(
$node_standby,
if ($node_standby->log_contains(
"requested WAL segment [0-9A-F]+ has already been removed",
$logstart))
{
@ -384,8 +381,7 @@ advance_wal($node_primary3, 2);
my $max_attempts = $PostgreSQL::Test::Utils::timeout_default;
while ($max_attempts-- >= 0)
{
if (find_in_log(
$node_primary3,
if ($node_primary3->log_contains(
"terminating process $senderpid to release replication slot \"rep3\"",
$logstart))
{
@ -407,8 +403,7 @@ $node_primary3->poll_query_until('postgres',
$max_attempts = $PostgreSQL::Test::Utils::timeout_default;
while ($max_attempts-- >= 0)
{
if (find_in_log(
$node_primary3,
if ($node_primary3->log_contains(
'invalidating slot "rep3" because its restart_lsn', $logstart))
{
ok(1, "slot invalidation logged");
@ -446,18 +441,4 @@ sub get_log_size
return (stat $node->logfile)[7];
}
# find $pat in logfile of $node after $off-th byte
sub find_in_log
{
my ($node, $pat, $off) = @_;
$off = 0 unless defined $off;
my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile);
return 0 if (length($log) <= $off);
$log = substr($log, $off);
return $log =~ m/$pat/;
}
done_testing();

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

@ -138,21 +138,11 @@ while ($max_attempts-- >= 0)
{
last
if (
find_in_log(
$node_standby, qr!WARNING: ( [A-Z0-9]+:)? creating missing directory: pg_tblspc/!,
$node_standby->log_contains(
qr!WARNING: ( [A-Z0-9]+:)? creating missing directory: pg_tblspc/!,
$logstart));
usleep(100_000);
}
ok($max_attempts > 0, "invalid directory creation is detected");
done_testing();
# find $pat in logfile of $node after $off-th byte
sub find_in_log
{
my ($node, $pat, $off) = @_;
my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile, $off);
return $log =~ m/$pat/;
}