database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Improve runtime and output of tests for replication slots checkpointing.

Browse Source 
The TAP tests that verify logical and physical replication slot behavior
during checkpoints (046_checkpoint_logical_slot.pl and
047_checkpoint_physical_slot.pl) inserted two batches of 2 million rows each,
generating approximately 520 MB of WAL.  On slow machines, or when compiled
with '-DRELCACHE_FORCE_RELEASE -DCATCACHE_FORCE_RELEASE', this caused the
tests to run for 8-9 minutes and occasionally time out, as seen on the
buildfarm animal prion.

This commit modifies the mentioned tests to utilize the $node->advance_wal()
function, thereby reducing runtime. Once we do not use the generated data,
the proposed function is a good alternative, which cuts the total wall-clock
run time.

While here, remove superfluous '\n' characters from several note() calls;
these appeared literally in the build-farm logs and looked odd.  Also, remove
excessive 'shared_preload_libraries' GUC from the config and add a check for
'injection_points' extension availability.

Reported-by: Alexander Lakhin <exclusion@gmail.com>
Reported-by: Tom Lane <tgl@sss.pgh.pa.us>
Author: Alexander Korotkov <aekorotkov@gmail.com>
Author: Vitaly Davydov <v.davydov@postgrespro.ru>
Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>
Discussion: https://postgr.es/m/fbc5d94e-6fbd-4a64-85d4-c9e284a58eb2%40gmail.com
Backpatch-through: 17
This commit is contained in:
Alexander Korotkov
2025-06-20 01:41:28 +03:00
parent 0f5ac7f321
commit 5ed50f9386
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/recovery/t/046_checkpoint_logical_slot.pl
View File

@@ -21,15 +21,21 @@ my ($node, $result);
$node = PostgreSQL::Test::Cluster->new('mike'); $node = PostgreSQL::Test::Cluster->new('mike');
$node->init; $node->init;
$node->append_conf('postgresql.conf',
"shared_preload_libraries = 'injection_points'");
$node->append_conf('postgresql.conf', "wal_level = 'logical'"); $node->append_conf('postgresql.conf', "wal_level = 'logical'");
$node->start; $node->start;
$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
# Create a simple table to generate data into. # Check if the extension injection_points is available, as it may be
$node->safe_psql('postgres', # possible that this script is run with installcheck, where the module
q{create table t (id serial primary key, b text)}); # would not be installed by default.
$result = $node->safe_psql('postgres',
"SELECT count(*) > 0 FROM pg_available_extensions WHERE name = 'injection_points';"
);
if ($result eq 'f')
{
plan skip_all => 'Extension injection_points not installed';
}
$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
# Create the two slots we'll need. # Create the two slots we'll need.
$node->safe_psql('postgres', $node->safe_psql('postgres',
@@ -58,23 +64,17 @@ SELECT 1 \watch 0.1
\q \q
)); ));
# Insert 2M rows; that's about 260MB (~20 segments) worth of WAL. $node->advance_wal(20);
$node->safe_psql('postgres',
q{insert into t (b) select md5(i::text) from generate_series(1,1000000) s(i)}
);
# Run another checkpoint to set a new restore LSN. # Run another checkpoint to set a new restore LSN.
$node->safe_psql('postgres', q{checkpoint}); $node->safe_psql('postgres', q{checkpoint});
# Another 2M rows; that's about 260MB (~20 segments) worth of WAL. $node->advance_wal(20);
$node->safe_psql('postgres',
q{insert into t (b) select md5(i::text) from generate_series(1,1000000) s(i)}
);
# Run another checkpoint, this time in the background, and make it wait # Run another checkpoint, this time in the background, and make it wait
# on the injection point) so that the checkpoint stops right before # on the injection point) so that the checkpoint stops right before
# removing old WAL segments. # removing old WAL segments.
note('starting checkpoint\n'); note('starting checkpoint');
my $checkpoint = $node->background_psql('postgres'); my $checkpoint = $node->background_psql('postgres');
$checkpoint->query_safe( $checkpoint->query_safe(
@@ -88,7 +88,7 @@ checkpoint;
)); ));
# Wait until the checkpoint stops right before removing WAL segments. # Wait until the checkpoint stops right before removing WAL segments.
note('waiting for injection_point\n'); note('waiting for injection_point');
$node->wait_for_event('checkpointer', 'checkpoint-before-old-wal-removal'); $node->wait_for_event('checkpointer', 'checkpoint-before-old-wal-removal');
note('injection_point is reached'); note('injection_point is reached');
@@ -107,7 +107,7 @@ select count(*) from pg_logical_slot_get_changes('slot_logical', null, null) \wa
)); ));
# Wait until the slot's restart_lsn points to the next WAL segment. # Wait until the slot's restart_lsn points to the next WAL segment.
note('waiting for injection_point\n'); note('waiting for injection_point');
$node->wait_for_event('client backend', $node->wait_for_event('client backend',
'logical-replication-slot-advance-segment'); 'logical-replication-slot-advance-segment');
note('injection_point is reached'); note('injection_point is reached');

26
src/test/recovery/t/047_checkpoint_physical_slot.pl
View File

@@ -21,15 +21,21 @@ my ($node, $result);
$node = PostgreSQL::Test::Cluster->new('mike'); $node = PostgreSQL::Test::Cluster->new('mike');
$node->init; $node->init;
$node->append_conf('postgresql.conf',
"shared_preload_libraries = 'injection_points'");
$node->append_conf('postgresql.conf', "wal_level = 'replica'"); $node->append_conf('postgresql.conf', "wal_level = 'replica'");
$node->start; $node->start;
$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
# Create a simple table to generate data into. # Check if the extension injection_points is available, as it may be
$node->safe_psql('postgres', # possible that this script is run with installcheck, where the module
q{create table t (id serial primary key, b text)}); # would not be installed by default.
$result = $node->safe_psql('postgres',
"SELECT count(*) > 0 FROM pg_available_extensions WHERE name = 'injection_points';"
);
if ($result eq 'f')
{
plan skip_all => 'Extension injection_points not installed';
}
$node->safe_psql('postgres', q(CREATE EXTENSION injection_points));
# Create a physical replication slot. # Create a physical replication slot.
$node->safe_psql('postgres', $node->safe_psql('postgres',
@@ -44,9 +50,7 @@ $node->safe_psql('postgres',
$node->safe_psql('postgres', q{checkpoint}); $node->safe_psql('postgres', q{checkpoint});
# Insert 2M rows; that's about 260MB (~20 segments) worth of WAL. # Insert 2M rows; that's about 260MB (~20 segments) worth of WAL.
$node->safe_psql('postgres', $node->advance_wal(20);
q{insert into t (b) select md5(i::text) from generate_series(1,100000) s(i)}
);
# Advance slot to the current position, just to have everything "valid". # Advance slot to the current position, just to have everything "valid".
$node->safe_psql('postgres', $node->safe_psql('postgres',
@@ -57,9 +61,7 @@ $node->safe_psql('postgres',
$node->safe_psql('postgres', q{checkpoint}); $node->safe_psql('postgres', q{checkpoint});
# Another 2M rows; that's about 260MB (~20 segments) worth of WAL. # Another 2M rows; that's about 260MB (~20 segments) worth of WAL.
$node->safe_psql('postgres', $node->advance_wal(20);
q{insert into t (b) select md5(i::text) from generate_series(1,1000000) s(i)}
);
my $restart_lsn_init = $node->safe_psql('postgres', my $restart_lsn_init = $node->safe_psql('postgres',
q{select restart_lsn from pg_replication_slots where slot_name = 'slot_physical'} q{select restart_lsn from pg_replication_slots where slot_name = 'slot_physical'}