From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 20 Sep 2017 15:28:34 +0000 (-0400)
Subject: Fix instability in subscription regression test.
X-Git-Tag: REL_10_0~34
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=ee266774454d5cce3375145e2f86a99910eb263f;p=postgresql.git

Fix instability in subscription regression test.

005_encoding.pl neglected to wait for the subscriber's initial
synchronization to happen.  While we have not seen this fail in
the buildfarm, it's pretty easy to demonstrate there's an issue
by hacking logicalrep_worker_launch() to fail most of the time.

Michael Paquier

Discussion: https://postgr.es/m/27032.1505749806@sss.pgh.pa.us
---

diff --git a/src/test/subscription/t/005_encoding.pl b/src/test/subscription/t/005_encoding.pl
index 26a40c0b7f1..2b0c47c07d3 100644
--- a/src/test/subscription/t/005_encoding.pl
+++ b/src/test/subscription/t/005_encoding.pl
@@ -41,6 +41,12 @@ $node_subscriber->safe_psql('postgres',
 
 wait_for_caught_up($node_publisher, $appname);
 
+# Wait for initial sync to finish as well
+my $synced_query =
+	"SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('s', 'r');";
+$node_subscriber->poll_query_until('postgres', $synced_query)
+  or die "Timed out while waiting for subscriber to synchronize data";
+
 $node_publisher->safe_psql('postgres',
 	q{INSERT INTO test1 VALUES (1, E'Mot\xc3\xb6rhead')}); # hand-rolled UTF-8