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:25 -0700 |
| commit | 512d76f6dbda2842a0bb9321eddffdf838dd888a (patch) | |
| tree | 7bfa9f06795f7b6bd4c9ea5238db60ee21839f8c | |
| parent | a5ede13916f312e7907ed4c1bf5a7b182ed196ab (diff) | |
| download | postgresql-512d76f6dbda2842a0bb9321eddffdf838dd888a.tar.gz postgresql-512d76f6dbda2842a0bb9321eddffdf838dd888a.zip | |
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 aa36582d110..a2e4c659f20 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 |