Hi,
On 2022-05-05 23:57:28 -0400, Tom Lane wrote:
> Andres Freund <and...@anarazel.de> writes:
> > On 2022-05-05 23:36:22 -0400, Tom Lane wrote:
> >> So I reluctantly vote for removing 031_recovery_conflict.pl in the
> >> back branches for now, with the expectation that we'll fix the
> >> infrastructure and put it back after the current release round
> >> is done.
>
> > What about instead marking the flapping test TODO? That'd still give us most
> > of the coverage...
>
> Are you sure there's just one test that's failing? I haven't checked
> the buildfarm history close enough to be sure of that. But if it's
> true, disabling just that one would be fine (again, as a stopgap
> measure).
I looked through all the failures I found and it's two kinds of failures, both
related to the deadlock test. So I'm thinking of skipping just that test as in
the attached.
Working on committing / backpatching that, unless somebody suggests changes
quickly...
Greetings,
Andres Freund
diff --git c/src/test/recovery/t/031_recovery_conflict.pl i/src/test/recovery/t/031_recovery_conflict.pl
index 52f00a6f514..72808095d21 100644
--- c/src/test/recovery/t/031_recovery_conflict.pl
+++ i/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
