From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Sun, 15 Nov 2020 15:09:31 +0000 (+0200)
Subject: Fix timing issue in pg_rewind test.
X-Git-Tag: REL_14_BETA1~1281
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39f9f04b57844143c7f510cc901501057103bfe4;p=thirdparty%2Fpostgresql.git

Fix timing issue in pg_rewind test.

The test inserts a row in primary server, waits until the insertion has
been replicated to a cascaded standby, and checks that it's visible there
by querying the cascaded standby. In order for that to work reliably, the
test needs to wait until the insertion WAL record has been fully replayed.

This should fix the occasional buildfarm failures. Diagnosis by Tom Lane.

Discussion: https://www.postgresql.org/message-id/606796.1605424022@sss.pgh.pa.us
---

diff --git a/src/bin/pg_rewind/t/007_standby_source.pl b/src/bin/pg_rewind/t/007_standby_source.pl
index 64b7f1a3be6..f6abcc2d987 100644
--- a/src/bin/pg_rewind/t/007_standby_source.pl
+++ b/src/bin/pg_rewind/t/007_standby_source.pl
@@ -155,7 +155,7 @@ $node_a->safe_psql('postgres',
 	"INSERT INTO tbl1 values ('in A, after rewind')");
 
 $lsn = $node_a->lsn('insert');
-$node_b->wait_for_catchup('node_c', 'write', $lsn);
+$node_b->wait_for_catchup('node_c', 'replay', $lsn);
 
 check_query(
 	'SELECT * FROM tbl1',