From: Noah Misch <noah@leadboat.com>
Date: Sat, 2 Jul 2022 01:27:18 +0000 (-0700)
Subject: Fix race condition in t/028_pitr_timelines.pl.
X-Git-Tag: REL_16_BETA1~2380
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f4c72c2dc06e944950305b0c1f48071ff49e263;p=thirdparty%2Fpostgresql.git

Fix race condition in t/028_pitr_timelines.pl.

Per buildfarm members sungazer and mylodon.  Back-patch to v15, which
introduced this test.

Discussion: https://postgr.es/m/20220627070457.GA2176699@rfd.leadboat.com
---

diff --git a/src/test/recovery/t/028_pitr_timelines.pl b/src/test/recovery/t/028_pitr_timelines.pl
index a8b12d9af6e..bad02edf90a 100644
--- a/src/test/recovery/t/028_pitr_timelines.pl
+++ b/src/test/recovery/t/028_pitr_timelines.pl
@@ -140,6 +140,13 @@ is($result, qq{1}, "check table contents after point-in-time recovery");
 # back to this timeline.
 $node_pitr->safe_psql('postgres', "INSERT INTO foo VALUES(3);");
 
+# Wait for the archiver to be running.  The startup process might have yet to
+# exit, in which case the postmaster has not started the archiver.  If we
+# stop() without an archiver, the archive will be incomplete.
+$node_pitr->poll_query_until('postgres',
+	"SELECT true FROM pg_stat_activity WHERE backend_type = 'archiver';")
+  or die "Timed out while waiting for archiver to start";
+
 # Stop the node.  This archives the last segment.
 $node_pitr->stop();