postgres
diff --git a/‎src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Copy file name to clipboardExpand all lines: src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
+7Lines changed: 7 additions & 0 deletions b/‎src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
Copy file name to clipboardExpand all lines: src/bin/pg_basebackup/t/040_pg_createsubscriber.pl
+7Lines changed: 7 additions & 0 deletions
@@ -116,6 +116,10 @@ sub generate_db
 my $node_p = PostgreSQL::Test::Cluster->new('node_p');
 my $pconnstr = $node_p->connstr;
 $node_p->init(allows_streaming => 'logical');
+# Disable autovacuum to avoid generating xid during stats update as otherwise
+# the new XID could then be replicated to standby at some random point making
+# slots at primary lag behind standby during slot sync.
+$node_p->append_conf('postgresql.conf', 'autovacuum = off');
 $node_p->start;
 
 # Set up node F as about-to-fail node
@@ -293,6 +297,9 @@ sub generate_db
 	"SELECT pg_create_logical_replication_slot('$fslotname', 'pgoutput', false, false, true)"
 );
 $node_s->start;
+# Wait for the standby to catch up so that the standby is not lagging behind
+# the failover slot.
+$node_p->wait_for_replay_catchup($node_s);
 $node_s->safe_psql('postgres', "SELECT pg_sync_replication_slots()");
 my $result = $node_s->safe_psql('postgres',
 	"SELECT slot_name FROM pg_replication_slots WHERE slot_name = '$fslotname' AND synced AND NOT temporary"