From: Thomas Munro Date: Wed, 2 Feb 2022 03:11:00 +0000 (+1300) Subject: Fix recovery conflict in 027_stream_regress.pl. X-Git-Tag: REL_15_BETA1~791 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d7c3e34475a750d0529f5912deedc9b1a1eedd8;p=thirdparty%2Fpostgresql.git Fix recovery conflict in 027_stream_regress.pl. To avoid "ERROR: canceling statement due to conflict with recovery", as seen on a couple of slower build farm animals, crank max_standby_streaming_delay right up. In passing, adjust a configuration option that accidentally used a non-standard format (not a problem, but needlessly inconsistent). Reviewed-by: Andres Freund Reviewed-by: Tom Lane Discussion: https://postgr.es/m/CA%2BhUKGK65xVqNgsSPyrr2LEwtfUN%3DGfEuQ868hTC-mu0bFG42A%40mail.gmail.com --- diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl index 782f24b429f..cd8163a4b53 100644 --- a/src/test/recovery/t/027_stream_regress.pl +++ b/src/test/recovery/t/027_stream_regress.pl @@ -20,7 +20,7 @@ else # Initialize primary node my $node_primary = PostgreSQL::Test::Cluster->new('primary'); $node_primary->init(allows_streaming => 1); -$node_primary->adjust_conf('postgresql.conf', 'max_connections', '25', 1); +$node_primary->adjust_conf('postgresql.conf', 'max_connections', '25'); $node_primary->append_conf('postgresql.conf', 'max_prepared_transactions = 10'); # WAL consistency checking is resource intensive so require opt-in with the @@ -48,6 +48,8 @@ $node_standby_1->init_from_backup($node_primary, $backup_name, has_streaming => 1); $node_standby_1->append_conf('postgresql.conf', "primary_slot_name = standby_1"); +$node_standby_1->append_conf('postgresql.conf', + 'max_standby_streaming_delay = 600s'); $node_standby_1->start; my $dlpath = PostgreSQL::Test::Utils::perl2host(dirname($ENV{REGRESS_SHLIB}));