mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix recovery conflict in 027_stream_regress.pl.

Browse Source 
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
This commit is contained in:
Thomas Munro 2022-02-02 16:11:00 +13:00
parent 020258fbd3
commit 4d7c3e3447
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/recovery/t/027_stream_regress.pl
View File

@ -20,7 +20,7 @@ else
# Initialize primary node # Initialize primary node
my $node_primary = PostgreSQL::Test::Cluster->new('primary'); my $node_primary = PostgreSQL::Test::Cluster->new('primary');
$node_primary->init(allows_streaming => 1); $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'); $node_primary->append_conf('postgresql.conf', 'max_prepared_transactions = 10');
# WAL consistency checking is resource intensive so require opt-in with the # 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); has_streaming => 1);
$node_standby_1->append_conf('postgresql.conf', $node_standby_1->append_conf('postgresql.conf',
"primary_slot_name = standby_1"); "primary_slot_name = standby_1");
$node_standby_1->append_conf('postgresql.conf',
'max_standby_streaming_delay = 600s');
$node_standby_1->start; $node_standby_1->start;
my $dlpath = PostgreSQL::Test::Utils::perl2host(dirname($ENV{REGRESS_SHLIB})); my $dlpath = PostgreSQL::Test::Utils::perl2host(dirname($ENV{REGRESS_SHLIB}));