Fix handling of orphaned 2PC files in the future at recovery

michaelpq · michaelpq · commit 03c46e1f26a1 · 2024-12-30T08:06:40.000+09:00
Before 728bd99, that has improved the support for 2PC files during recovery, the initial logic scanning files in pg_twophase was done so as files in the future of the transaction ID horizon were checked first, followed by a check if a transaction ID is aborted or committed which could involve a pg_xact lookup. After this commit, these checks have been done in reverse order. Files detected as in the future do not have a state that can be checked in pg_xact, hence this caused recovery to fail abruptly should an orphaned 2PC file in the future of the transaction ID horizon exist in pg_twophase at the beginning of recovery. A test is added to check for this scenario, using an empty 2PC with a transaction ID large enough to be in the future when running the test. This test is added in 16 and older versions for now. 17 and newer versions are impacted by a second bug caused by the addition of the epoch in the 2PC file names. An equivalent test will be added in these branches in a follow-up commit, once the second set of issues reported are fixed. Author: Vitaly Davydov, Michael Paquier Discussion: https://postgr.es/m/11e597-676ab680-8d-374f23c0@145466129 Backpatch-through: 13
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2207,40 +2207,40 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 	if (!fromdisk)
 		Assert(prepare_start_lsn != InvalidXLogRecPtr);
 
-	/* Already processed? */
-	if (TransactionIdDidCommit(xid) || TransactionIdDidAbort(xid))
+	/* Reject XID if too new */
+	if (TransactionIdFollowsOrEquals(xid, origNextXid))
 	{
 		if (fromdisk)
 		{
 			ereport(WARNING,
-					(errmsg("removing stale two-phase state file for transaction %u",
+					(errmsg("removing future two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 		}
 		else
 		{
 			ereport(WARNING,
-					(errmsg("removing stale two-phase state from memory for transaction %u",
+					(errmsg("removing future two-phase state from memory for transaction %u",
 							xid)));
 			PrepareRedoRemove(xid, true);
 		}
 		return NULL;
 	}
 
-	/* Reject XID if too new */
-	if (TransactionIdFollowsOrEquals(xid, origNextXid))
+	/* Already processed? */
+	if (TransactionIdDidCommit(xid) || TransactionIdDidAbort(xid))
 	{
 		if (fromdisk)
 		{
 			ereport(WARNING,
-					(errmsg("removing future two-phase state file for transaction %u",
+					(errmsg("removing stale two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 		}
 		else
 		{
 			ereport(WARNING,
-					(errmsg("removing future two-phase state from memory for transaction %u",
+					(errmsg("removing stale two-phase state from memory for transaction %u",
 							xid)));
 			PrepareRedoRemove(xid, true);
 		}

Original file line number	Diff line number	Diff line change
`@@ -2207,40 +2207,40 @@ ProcessTwoPhaseBuffer(TransactionId xid,`
`2207`	`2207`	`if (!fromdisk)`
`2208`	`2208`	`Assert(prepare_start_lsn != InvalidXLogRecPtr);`
`2209`	`2209`
`2210`		`- /* Already processed? */`
`2211`		`- if (TransactionIdDidCommit(xid) \|\| TransactionIdDidAbort(xid))`
	`2210`	`+ /* Reject XID if too new */`
	`2211`	`+ if (TransactionIdFollowsOrEquals(xid, origNextXid))`
`2212`	`2212`	`{`
`2213`	`2213`	`if (fromdisk)`
`2214`	`2214`	`{`
`2215`	`2215`	`ereport(WARNING,`
`2216`		`- (errmsg("removing stale two-phase state file for transaction %u",`
	`2216`	`+ (errmsg("removing future two-phase state file for transaction %u",`
`2217`	`2217`	`xid)));`
`2218`	`2218`	`RemoveTwoPhaseFile(xid, true);`
`2219`	`2219`	`}`
`2220`	`2220`	`else`
`2221`	`2221`	`{`
`2222`	`2222`	`ereport(WARNING,`
`2223`		`- (errmsg("removing stale two-phase state from memory for transaction %u",`
	`2223`	`+ (errmsg("removing future two-phase state from memory for transaction %u",`
`2224`	`2224`	`xid)));`
`2225`	`2225`	`PrepareRedoRemove(xid, true);`
`2226`	`2226`	`}`
`2227`	`2227`	`return NULL;`
`2228`	`2228`	`}`
`2229`	`2229`
`2230`		`- /* Reject XID if too new */`
`2231`		`- if (TransactionIdFollowsOrEquals(xid, origNextXid))`
	`2230`	`+ /* Already processed? */`
	`2231`	`+ if (TransactionIdDidCommit(xid) \|\| TransactionIdDidAbort(xid))`
`2232`	`2232`	`{`
`2233`	`2233`	`if (fromdisk)`
`2234`	`2234`	`{`
`2235`	`2235`	`ereport(WARNING,`
`2236`		`- (errmsg("removing future two-phase state file for transaction %u",`
	`2236`	`+ (errmsg("removing stale two-phase state file for transaction %u",`
`2237`	`2237`	`xid)));`
`2238`	`2238`	`RemoveTwoPhaseFile(xid, true);`
`2239`	`2239`	`}`
`2240`	`2240`	`else`
`2241`	`2241`	`{`
`2242`	`2242`	`ereport(WARNING,`
`2243`		`- (errmsg("removing future two-phase state from memory for transaction %u",`
	`2243`	`+ (errmsg("removing stale two-phase state from memory for transaction %u",`
`2244`	`2244`	`xid)));`
`2245`	`2245`	`PrepareRedoRemove(xid, true);`
`2246`	`2246`	`}`