Hi, On Thu, Feb 29, 2024 at 02:34:35PM +0500, Andrey M. Borodin wrote: > > > > On 29 Feb 2024, at 13:35, Bertrand Drouvot <bertranddrouvot...@gmail.com> > > wrote: > > > > Something like the attached? > > There's extraneous print "done\n";
doh! bad copy/paste ;-) > Also can we have optional backend type :) done in v2 attached. Regards, -- Bertrand Drouvot PostgreSQL Contributors Team RDS Open Source Databases Amazon Web Services: https://aws.amazon.com
>From a2ece828e93e6e919243e8d2529b33d48d05f084 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot <bertranddrouvot...@gmail.com> Date: Thu, 29 Feb 2024 08:31:28 +0000 Subject: [PATCH v2] Adding wait_for_injection_point helper --- src/test/perl/PostgreSQL/Test/Cluster.pm | 25 +++++++++++++++++++ .../recovery/t/041_checkpoint_at_promote.pl | 8 +----- 2 files changed, 26 insertions(+), 7 deletions(-) 59.8% src/test/perl/PostgreSQL/Test/ 40.1% src/test/recovery/t/ diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm index 44c1bb5afd..559d3febca 100644 --- a/src/test/perl/PostgreSQL/Test/Cluster.pm +++ b/src/test/perl/PostgreSQL/Test/Cluster.pm @@ -2742,6 +2742,31 @@ sub lsn =pod +=item $node->wait_for_injection_point(injection_name, backend_type) + +Wait for the backend_type to wait for the injection point name. + +=cut + +sub wait_for_injection_point +{ + my ($self, $injection_name, $backend_type) = @_; + + $backend_type = defined($backend_type) ? qq('$backend_type') : 'backend_type'; + + $self->poll_query_until( + 'postgres', qq[ + SELECT count(*) > 0 FROM pg_stat_activity + WHERE backend_type = $backend_type AND wait_event = '$injection_name' + ]) + or die + "timed out waiting for the backend type to wait for the injection point name"; + + return; +} + +=pod + =item $node->wait_for_catchup(standby_name, mode, target_lsn) Wait for the replication connection with application_name standby_name until diff --git a/src/test/recovery/t/041_checkpoint_at_promote.pl b/src/test/recovery/t/041_checkpoint_at_promote.pl index 47381a2c82..3d6faabc0b 100644 --- a/src/test/recovery/t/041_checkpoint_at_promote.pl +++ b/src/test/recovery/t/041_checkpoint_at_promote.pl @@ -79,13 +79,7 @@ $node_primary->wait_for_replay_catchup($node_standby); # Wait until the checkpointer is in the middle of the restart point # processing, relying on the custom wait event generated in the # wait callback used in the injection point previously attached. -ok( $node_standby->poll_query_until( - 'postgres', - qq[SELECT count(*) FROM pg_stat_activity - WHERE backend_type = 'checkpointer' AND wait_event = 'CreateRestartPoint' ;], - '1'), - 'checkpointer is waiting in restart point' -) or die "Timed out while waiting for checkpointer to run restart point"; +$node_standby->wait_for_injection_point('CreateRestartPoint','checkpointer'); # Check the logs that the restart point has started on standby. This is # optional, but let's be sure. -- 2.34.1