aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2024-02-19 12:52:07 -0800
committerNoah Misch <noah@leadboat.com>2024-02-19 12:52:48 -0800
commitf024746484b966f916e6d8e1d0bd39de51aad2e1 (patch)
treef66fa4fa8bc55fe966202ebd5e5fdc55c1de068b
parent6257ebf1e335b0ca73a460aa9774e3c782506cee (diff)
downloadpostgresql-f024746484b966f916e6d8e1d0bd39de51aad2e1.tar.gz
postgresql-f024746484b966f916e6d8e1d0bd39de51aad2e1.zip
Bound waits in 035_standby_logical_decoding.pl.
One IPC::Run::start() used an IPC::Run::timer() without checking for expiration. The other used no timeout or timer. Back-patch to v16, which introduced the test. Reviewed by Bertrand Drouvot. Discussion: https://postgr.es/m/20240211010227.a2.nmisch@google.com
-rw-r--r--src/test/recovery/t/035_standby_logical_decoding.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/recovery/t/035_standby_logical_decoding.pl b/src/test/recovery/t/035_standby_logical_decoding.pl
index 831c32dde9b..f02eb39de92 100644
--- a/src/test/recovery/t/035_standby_logical_decoding.pl
+++ b/src/test/recovery/t/035_standby_logical_decoding.pl
@@ -21,7 +21,6 @@ my $node_cascading_standby =
PostgreSQL::Test::Cluster->new('cascading_standby');
my $node_subscriber = PostgreSQL::Test::Cluster->new('subscriber');
my $default_timeout = $PostgreSQL::Test::Utils::timeout_default;
-my $psql_timeout = IPC::Run::timer($default_timeout);
my $res;
# Name for the physical slot on primary
@@ -90,7 +89,8 @@ sub make_slot_active
'>',
$to_stdout,
'2>',
- $to_stderr);
+ $to_stderr,
+ IPC::Run::timeout($default_timeout));
if ($wait)
{
@@ -343,7 +343,7 @@ $psql_subscriber{run} = IPC::Run::start(
\$psql_subscriber{subscriber_stdout},
'2>',
\$psql_subscriber{subscriber_stderr},
- $psql_timeout);
+ IPC::Run::timeout($default_timeout));
##################################################
# Test that logical decoding on the standby