From 8b9991cf07c0d98018b506b7aa47580a14db6a95 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 4 May 2022 14:15:36 -0700 Subject: [PATCH] Revert "Fix timing issue in deadlock recovery conflict test." This reverts commit 7a1267f9fe74c8ab7bab08e58dfdb965fafc6e11. --- src/test/recovery/t/031_recovery_conflict.pl | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/test/recovery/t/031_recovery_conflict.pl b/src/test/recovery/t/031_recovery_conflict.pl index a2e4c659f2..aa36582d11 100644 --- a/src/test/recovery/t/031_recovery_conflict.pl +++ b/src/test/recovery/t/031_recovery_conflict.pl @@ -231,14 +231,6 @@ 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 @@ -294,9 +286,6 @@ 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