Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 438a062

Browse files
committed
Fix deadlock at startup, if max_prepared_transactions is too small.
When the startup process recovers transactions by scanning pg_twophase directory, it should clear MyLockedGxact after it's done processing each transaction. Like we do during normal operation, at PREPARE TRANSACTION. Otherwise, if the startup process exits due to an error, it will try to clear the locking_backend field of the last recovered transaction. That's usually harmless, but if the error happens in MarkAsPreparing, while holding TwoPhaseStateLock, the shmem-exit hook will try to acquire TwoPhaseStateLock again, and deadlock with itself. This fixes bug #13128 reported by Grant McAlister. The bug was introduced by commit bb38fb0, so backpatch to all supported versions like that commit.
1 parent 7f2bfeb commit 438a062

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/backend/access/transam/twophase.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,6 +2045,12 @@ RecoverPreparedTransactions(void)
20452045
if (InHotStandby)
20462046
StandbyReleaseLockTree(xid, hdr->nsubxacts, subxids);
20472047

2048+
/*
2049+
* We're done with recovering this transaction. Clear MyLockedGxact,
2050+
* like we do in PrepareTransaction() during normal operation.
2051+
*/
2052+
PostPrepare_Twophase();
2053+
20482054
pfree(buf);
20492055
}
20502056
}

0 commit comments

Comments
 (0)