From f40d362a667f6cf36f17d7565e4d7565fb7910f3 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 6 May 2022 09:01:08 -0700 Subject: [PATCH] Temporarily skip recovery deadlock test in back branches. The recovery deadlock test has a timing issue that was fixed in 5136967f1eb in HEAD. Unfortunately the same fix doesn't quite work in the back branches: 1) adjust_conf() doesn't exist, which is easy enough to work around 2) a restart cleares the recovery conflict stats < 15. These issues can be worked around, but given the upcoming set of minor releases, skip the problematic test for now. The buildfarm doesn't show failures in other parts of 031_recovery_conflict.pl. Discussion: https://postgr.es/m/20220506155827.dfnaheq6ufylwrqf@alap3.anarazel.de Backpatch: 10-14 --- src/test/recovery/t/031_recovery_conflict.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/recovery/t/031_recovery_conflict.pl b/src/test/recovery/t/031_recovery_conflict.pl index 52f00a6f514..72808095d21 100644 --- a/src/test/recovery/t/031_recovery_conflict.pl +++ b/src/test/recovery/t/031_recovery_conflict.pl @@ -228,6 +228,10 @@ check_conflict_stat("lock"); ## RECOVERY CONFLICT 5: Deadlock +SKIP: +{ + skip "disabled until after minor releases, due to instability"; + $sect = "startup deadlock"; $expected_conflicts++; @@ -286,6 +290,7 @@ check_conflict_stat("deadlock"); # clean up for next tests $node_primary->safe_psql($test_db, qq[ROLLBACK PREPARED 'lock';]); +} # Check that expected number of conflicts show in pg_stat_database. Needs to