Enable archiving in recovery TAP test 009_twophase.pl

This is a follow-up of f663b00, that has been committed to v13 and v14,
tweaking the TAP test for two-phase transactions so as it provides
coverage for the bug that has been fixed.  This change is done in its
own commit for clarity, as v15 and HEAD did not show the problematic
behavior, still missed coverage for it.

While on it, this adds a comment about the dependency of the last
partial segment rename and RecoverPreparedTransactions() at the end of
recovery, as that can be easy to miss.

Author: Michael Paquier
Reviewed-by: Kyotaro Horiguchi
Discussion: https://postgr.es/m/743b9b45a2d4013bd90b6a5cba8d6faeb717ee34[email protected]
Backpatch-through: 13

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index b2430f617c079311df6734156021cdea0fad9679..8b0710abe6037cec974b2f44f0fc21f9d6dc83b8 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5689,7 +5689,11 @@ StartupXLOG(void)
    TrimCLOG();
    TrimMultiXact();
 
-   /* Reload shared-memory state for prepared transactions */
+   /*
+    * Reload shared-memory state for prepared transactions.  This needs to
+    * happen before renaming the last partial segment of the old timeline as
+    * it may be possible that we have to recovery some transactions from it.
+    */
    RecoverPreparedTransactions();
 
    /* Shut down xlogreader */

diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
index e1273fd0f1204fdabf01cd379ecb5bd400f7e3d6..64c300db2bb8227f4494f7c9ac337043a5264058 100644 (file)
--- a/src/test/recovery/t/009_twophase.pl
+++ b/src/test/recovery/t/009_twophase.pl
@@ -32,7 +32,9 @@ sub configure_and_reload
 
 # Setup london node
 my $node_london = PostgreSQL::Test::Cluster->new("london");
-$node_london->init(allows_streaming => 1);
+# Archiving is used to provide coverage with the creation of .partial segments
+# done at the end of recovery and the recovery of two-phase transactions.
+$node_london->init(allows_streaming => 1, has_archiving => 1);
 $node_london->append_conf(
    'postgresql.conf', qq(
    max_prepared_transactions = 10