diff options
author | Andres Freund <andres@anarazel.de> | 2022-05-04 12:50:38 -0700 |
---|---|---|
committer | Andres Freund <andres@anarazel.de> | 2022-05-04 12:57:20 -0700 |
commit | 8a3a8d9f103e360fffc02089810a520e22521ae2 (patch) | |
tree | a9d7dfb903e22fd83e340a3997f93219ffe2ba66 | |
parent | 0446d3bf3909247f06de9b8f08a739caf7cc72ca (diff) | |
download | postgresql-8a3a8d9f103e360fffc02089810a520e22521ae2.tar.gz |
Fix timing issue in deadlock recovery conflict test.
Per buildfarm members longfin and skink.
Discussion: https://postgr.es/m/20220413002626.udl7lll7f3o7nre7@alap3.anarazel.de
Backpatch: 10-
-rw-r--r-- | src/test/recovery/t/031_recovery_conflict.pl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/recovery/t/031_recovery_conflict.pl b/src/test/recovery/t/031_recovery_conflict.pl index aa36582d11..a2e4c659f2 100644 --- a/src/test/recovery/t/031_recovery_conflict.pl +++ b/src/test/recovery/t/031_recovery_conflict.pl @@ -231,6 +231,14 @@ check_conflict_stat("lock"); $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 @@ -286,6 +294,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 |