From: Andres Freund <andres@anarazel.de>
Date: Wed, 4 May 2022 21:15:42 +0000 (-0700)
Subject: Revert "Fix timing issue in deadlock recovery conflict test."
X-Git-Tag: REL_12_11~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8019423764e4f6ac0ce09073593cf752a61d2dea;p=thirdparty%2Fpostgresql.git

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

This reverts commit 512d76f6dbda2842a0bb9321eddffdf838dd888a.
---

diff --git a/src/test/recovery/t/031_recovery_conflict.pl b/src/test/recovery/t/031_recovery_conflict.pl
index a2e4c659f20..aa36582d110 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