postgres.git / summary / log / commit / refs

commit    63c5df126abb7364b70dafe75fef576dd8eb0bbc
Author:   Amit Kapila <akapila@postgresql.org>
Date:     Tue Dec 05 03:40:06 2023 +0000

    Fix a random failure in 003_logical_slots.pl.
    
    The failed test was trying to validate that the two_phase option for a
    slot is retained after the upgrade. The problem was that it didn't get
    enabled before the upgrade so expecting to be enabled after the upgrade
    was not right in the first place. This is a timing issue because we enable
    the two_phase once the initial sync for all the tables is finished.
    Normally, we wait for the two_phase state to be enabled but this test
    missed that step.
    
    Per buildfarm.
    
    Author: Hayato Kuroda
    Discussion: https://postgr.es/m/TY3PR01MB98892396D1071FC4320D6B31F586A@TY3PR01MB9889.jpnprd01.prod.outlook.com


 src/bin/pg_upgrade/t/003_logical_slots.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/bin/pg_upgrade/t/003_logical_slots.pl b/src/bin/pg_upgrade/t/003_logical_slots.pl
index 087a4cd6e8f..020e7aa1cce 100644
--- a/src/bin/pg_upgrade/t/003_logical_slots.pl
+++ b/src/bin/pg_upgrade/t/003_logical_slots.pl
@@ -163,6 +163,12 @@ $sub->safe_psql(
 ]);
 $sub->wait_for_subscription_sync($oldpub, 'regress_sub');
 
+# Also wait for two-phase to be enabled
+my $twophase_query =
+  "SELECT count(1) = 0 FROM pg_subscription WHERE subtwophasestate NOT IN ('e');";
+$sub->poll_query_until('postgres', $twophase_query)
+  or die "Timed out while waiting for subscriber to enable twophase";
+
 # 2. Temporarily disable the subscription
 $sub->safe_psql('postgres', "ALTER SUBSCRIPTION regress_sub DISABLE");
 $oldpub->stop;


[parent: a86c61c9eefa]