aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/backend/access/transam/twophase.c7
-rw-r--r--src/backend/access/transam/xlog.c14
-rw-r--r--src/backend/storage/ipc/procarray.c18
-rw-r--r--src/backend/storage/ipc/standby.c6
-rw-r--r--src/include/storage/standby.h10
-rw-r--r--src/test/recovery/t/009_twophase.pl48
-rw-r--r--src/tools/pgindent/typedefs.list1
7 files changed, 86 insertions, 18 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 71b54e0292d..ee1f0b7f182 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -2048,9 +2048,8 @@ PrescanPreparedTransactions(TransactionId **xids_p, int *nxids_p)
* This is never called at the end of recovery - we use
* RecoverPreparedTransactions() at that point.
*
- * The lack of calls to SubTransSetParent() calls here is by design;
- * those calls are made by RecoverPreparedTransactions() at the end of recovery
- * for those xacts that need this.
+ * This updates pg_subtrans, so that any subtransactions will be correctly
+ * seen as in-progress in snapshots taken during recovery.
*/
void
StandbyRecoverPreparedTransactions(void)
@@ -2070,7 +2069,7 @@ StandbyRecoverPreparedTransactions(void)
buf = ProcessTwoPhaseBuffer(xid,
gxact->prepare_start_lsn,
- gxact->ondisk, false, false);
+ gxact->ondisk, true, false);
if (buf != NULL)
pfree(buf);
}
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 98e4cbc27dd..d36784627d9 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7044,6 +7044,9 @@ StartupXLOG(void)
RunningTransactionsData running;
TransactionId latestCompletedXid;
+ /* Update pg_subtrans entries for any prepared transactions */
+ StandbyRecoverPreparedTransactions();
+
/*
* Construct a RunningTransactions snapshot representing a
* shut down server, with only prepared transactions still
@@ -7052,7 +7055,7 @@ StartupXLOG(void)
*/
running.xcnt = nxids;
running.subxcnt = 0;
- running.subxid_overflow = false;
+ running.subxid_status = SUBXIDS_IN_SUBTRANS;
running.nextXid = XidFromFullTransactionId(checkPoint.nextFullXid);
running.oldestRunningXid = oldestActiveXID;
latestCompletedXid = XidFromFullTransactionId(checkPoint.nextFullXid);
@@ -7062,8 +7065,6 @@ StartupXLOG(void)
running.xids = xids;
ProcArrayApplyRecoveryInfo(&running);
-
- StandbyRecoverPreparedTransactions();
}
}
@@ -9977,6 +9978,9 @@ xlog_redo(XLogReaderState *record)
oldestActiveXID = PrescanPreparedTransactions(&xids, &nxids);
+ /* Update pg_subtrans entries for any prepared transactions */
+ StandbyRecoverPreparedTransactions();
+
/*
* Construct a RunningTransactions snapshot representing a shut
* down server, with only prepared transactions still alive. We're
@@ -9985,7 +9989,7 @@ xlog_redo(XLogReaderState *record)
*/
running.xcnt = nxids;
running.subxcnt = 0;
- running.subxid_overflow = false;
+ running.subxid_status = SUBXIDS_IN_SUBTRANS;
running.nextXid = XidFromFullTransactionId(checkPoint.nextFullXid);
running.oldestRunningXid = oldestActiveXID;
latestCompletedXid = XidFromFullTransactionId(checkPoint.nextFullXid);
@@ -9995,8 +9999,6 @@ xlog_redo(XLogReaderState *record)
running.xids = xids;
ProcArrayApplyRecoveryInfo(&running);
-
- StandbyRecoverPreparedTransactions();
}
/* ControlFile->checkPointCopy always tracks the latest ckpt XID */
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 1cdd3d3f3e5..cf4ddcc0bd5 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -734,7 +734,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
* If the snapshot isn't overflowed or if its empty we can reset our
* pending state and use this snapshot instead.
*/
- if (!running->subxid_overflow || running->xcnt == 0)
+ if (running->subxid_status != SUBXIDS_MISSING || running->xcnt == 0)
{
/*
* If we have already collected known assigned xids, we need to
@@ -888,7 +888,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
* missing, so conservatively assume the last one is latestObservedXid.
* ----------
*/
- if (running->subxid_overflow)
+ if (running->subxid_status == SUBXIDS_MISSING)
{
standbyState = STANDBY_SNAPSHOT_PENDING;
@@ -900,6 +900,18 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
standbyState = STANDBY_SNAPSHOT_READY;
standbySnapshotPendingXmin = InvalidTransactionId;
+
+ /*
+ * If the 'xids' array didn't include all subtransactions, we have to
+ * mark any snapshots taken as overflowed.
+ */
+ if (running->subxid_status == SUBXIDS_IN_SUBTRANS)
+ procArray->lastOverflowedXid = latestObservedXid;
+ else
+ {
+ Assert(running->subxid_status == SUBXIDS_IN_ARRAY);
+ procArray->lastOverflowedXid = InvalidTransactionId;
+ }
}
/*
@@ -2117,7 +2129,7 @@ GetRunningTransactionData(void)
CurrentRunningXacts->xcnt = count - subcount;
CurrentRunningXacts->subxcnt = subcount;
- CurrentRunningXacts->subxid_overflow = suboverflowed;
+ CurrentRunningXacts->subxid_status = suboverflowed ? SUBXIDS_IN_SUBTRANS : SUBXIDS_IN_ARRAY;
CurrentRunningXacts->nextXid = XidFromFullTransactionId(ShmemVariableCache->nextFullXid);
CurrentRunningXacts->oldestRunningXid = oldestRunningXid;
CurrentRunningXacts->latestCompletedXid = latestCompletedXid;
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index d5adc3e61a3..b67fe9a481d 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -927,7 +927,7 @@ standby_redo(XLogReaderState *record)
running.xcnt = xlrec->xcnt;
running.subxcnt = xlrec->subxcnt;
- running.subxid_overflow = xlrec->subxid_overflow;
+ running.subxid_status = xlrec->subxid_overflow ? SUBXIDS_MISSING : SUBXIDS_IN_ARRAY;
running.nextXid = xlrec->nextXid;
running.latestCompletedXid = xlrec->latestCompletedXid;
running.oldestRunningXid = xlrec->oldestRunningXid;
@@ -1083,7 +1083,7 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts)
xlrec.xcnt = CurrRunningXacts->xcnt;
xlrec.subxcnt = CurrRunningXacts->subxcnt;
- xlrec.subxid_overflow = CurrRunningXacts->subxid_overflow;
+ xlrec.subxid_overflow = (CurrRunningXacts->subxid_status != SUBXIDS_IN_ARRAY);
xlrec.nextXid = CurrRunningXacts->nextXid;
xlrec.oldestRunningXid = CurrRunningXacts->oldestRunningXid;
xlrec.latestCompletedXid = CurrRunningXacts->latestCompletedXid;
@@ -1100,7 +1100,7 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts)
recptr = XLogInsert(RM_STANDBY_ID, XLOG_RUNNING_XACTS);
- if (CurrRunningXacts->subxid_overflow)
+ if (xlrec.subxid_overflow)
elog(trace_recovery(DEBUG2),
"snapshot of %u running transactions overflowed (lsn %X/%X oldest xid %u latest complete %u next xid %u)",
CurrRunningXacts->xcnt,
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index a3f8f82ff32..24195fefe01 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -67,11 +67,19 @@ extern void StandbyReleaseOldLocks(TransactionId oldxid);
* almost immediately see the data we need to begin executing queries.
*/
+typedef enum
+{
+ SUBXIDS_IN_ARRAY, /* xids array includes all running subxids */
+ SUBXIDS_MISSING, /* snapshot overflowed, subxids are missing */
+ SUBXIDS_IN_SUBTRANS, /* subxids are not included in 'xids', but
+ * pg_subtrans is fully up-to-date */
+} subxids_array_status;
+
typedef struct RunningTransactionsData
{
int xcnt; /* # of xact ids in xids[] */
int subxcnt; /* # of subxact ids in xids[] */
- bool subxid_overflow; /* snapshot overflowed, subxids missing */
+ subxids_array_status subxid_status;
TransactionId nextXid; /* xid from ShmemVariableCache->nextFullXid */
TransactionId oldestRunningXid; /* *not* oldestXmin */
TransactionId latestCompletedXid; /* so we can set xmax */
diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
index 4a79c5ebfdb..308014a9876 100644
--- a/src/test/recovery/t/009_twophase.pl
+++ b/src/test/recovery/t/009_twophase.pl
@@ -4,7 +4,7 @@ use warnings;
use PostgresNode;
use TestLib;
-use Test::More tests => 24;
+use Test::More tests => 27;
my $psql_out = '';
my $psql_rc = '';
@@ -306,6 +306,52 @@ $cur_standby->start;
$cur_master->psql('postgres', "COMMIT PREPARED 'xact_009_12'");
###############################################################################
+# Check visibility of prepared transactions in standby after a restart while
+# primary is down.
+###############################################################################
+
+$cur_master->psql(
+ 'postgres', "
+ CREATE TABLE t_009_tbl_standby_mvcc (id int, msg text);
+ BEGIN;
+ INSERT INTO t_009_tbl_standby_mvcc VALUES (1, 'issued to ${cur_master_name}');
+ SAVEPOINT s1;
+ INSERT INTO t_009_tbl_standby_mvcc VALUES (2, 'issued to ${cur_master_name}');
+ PREPARE TRANSACTION 'xact_009_standby_mvcc';
+ ");
+$cur_master->stop;
+$cur_standby->restart;
+
+# Acquire a snapshot in standby, before we commit the prepared transaction
+my $standby_session = $cur_standby->background_psql('postgres', on_error_die => 1);
+$standby_session->query_safe("BEGIN ISOLATION LEVEL REPEATABLE READ");
+$psql_out = $standby_session->query_safe(
+ "SELECT count(*) FROM t_009_tbl_standby_mvcc");
+is($psql_out, '0',
+ "Prepared transaction not visible in standby before commit");
+
+# Commit the transaction in primary
+$cur_master->start;
+$cur_master->psql('postgres', "
+SET synchronous_commit='remote_apply'; -- To ensure the standby is caught up
+COMMIT PREPARED 'xact_009_standby_mvcc';
+");
+
+# Still not visible to the old snapshot
+$psql_out = $standby_session->query_safe(
+ "SELECT count(*) FROM t_009_tbl_standby_mvcc");
+is($psql_out, '0',
+ "Committed prepared transaction not visible to old snapshot in standby");
+
+# Is visible to a new snapshot
+$standby_session->query_safe("COMMIT");
+$psql_out = $standby_session->query_safe(
+ "SELECT count(*) FROM t_009_tbl_standby_mvcc");
+is($psql_out, '2',
+ "Committed prepared transaction is visible to new snapshot in standby");
+$standby_session->quit;
+
+###############################################################################
# Check for a lock conflict between prepared transaction with DDL inside and
# replay of XLOG_STANDBY_LOCK wal record.
###############################################################################
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 66c28f0ff4a..b4abd380c70 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -3263,6 +3263,7 @@ string
substitute_actual_parameters_context
substitute_actual_srf_parameters_context
substitute_phv_relids_context
+subxids_array_status
svtype
symbol
tablespaceinfo
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 13:06:59 +0000