mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timing issue in deadlock recovery conflict test.

Browse Source 
Per buildfarm members longfin and skink.

Discussion: https://postgr.es/m/20220413002626.udl7lll7f3o7nre7@alap3.anarazel.de
Backpatch: 10-
This commit is contained in:
Andres Freund 2022-05-04 12:50:38 -07:00
parent c40ba5f318
commit 9e6b7b45ca
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/recovery/t/031_recovery_conflict.pl
View File

@ -226,6 +226,14 @@ check_conflict_stat("tablespace");
$sect = "startup deadlock";
$expected_conflicts++;
# Want to test recovery deadlock conflicts, not buffer pin conflicts. Without
# changing max_standby_streaming_delay it'd be timing dependent what we hit
# first
$node_standby->adjust_conf('postgresql.conf', 'max_standby_streaming_delay',
"${PostgreSQL::Test::Utils::timeout_default}s");
$node_standby->restart();
reconnect_and_clear();
# Generate a few dead rows, to later be cleaned up by vacuum. Then acquire a
# lock on another relation in a prepared xact, so it's held continuously by
# the startup process. The standby psql will block acquiring that lock while
@ -281,6 +289,9 @@ check_conflict_stat("deadlock");
# clean up for next tests
$node_primary->safe_psql($test_db, qq[ROLLBACK PREPARED 'lock';]);
$node_standby->adjust_conf('postgresql.conf', 'max_standby_streaming_delay', '50ms');
$node_standby->restart();
reconnect_and_clear();
# Check that expected number of conflicts show in pg_stat_database. Needs to