database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-18 17:41:14 +03:00
Code

Revert "Fix timing issue in deadlock recovery conflict test."

Browse Source 
This reverts commit 8a3a8d9f103e360fffc02089810a520e22521ae2.
This commit is contained in:
Andres Freund 2022-05-04 14:16:41 -07:00
parent 8a3a8d9f10
commit 27e97d0747
1 changed files with 0 additions and 11 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

@ -231,14 +231,6 @@ check_conflict_stat("lock");
$sect = "startup deadlock"; $sect = "startup deadlock";
$expected_conflicts++; $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 # 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 # 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 # the startup process. The standby psql will block acquiring that lock while
@ -294,9 +286,6 @@ check_conflict_stat("deadlock");
# clean up for next tests # clean up for next tests
$node_primary->safe_psql($test_db, qq[ROLLBACK PREPARED 'lock';]); $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 # Check that expected number of conflicts show in pg_stat_database. Needs to