Fix recovery conflict in 027_stream_regress.pl.
authorThomas Munro <tmunro@postgresql.org>
Wed, 2 Feb 2022 03:11:00 +0000 (16:11 +1300)
committerThomas Munro <tmunro@postgresql.org>
Wed, 2 Feb 2022 03:11:00 +0000 (16:11 +1300)
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 <andres@anarazel.de>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/CA%2BhUKGK65xVqNgsSPyrr2LEwtfUN%3DGfEuQ868hTC-mu0bFG42A%40mail.gmail.com

src/test/recovery/t/027_stream_regress.pl

index 782f24b429fa1e2a111cfb41143ecb76d77371d3..cd8163a4b539eb8a215590e111bf37cc5b5df51a 100644 (file)
@@ -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}));