]> granicus.if.org Git - postgresql/commitdiff
Fix deadlock at startup, if max_prepared_transactions is too small.
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Thu, 23 Apr 2015 18:25:44 +0000 (21:25 +0300)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Thu, 23 Apr 2015 18:36:59 +0000 (21:36 +0300)
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 bb38fb0d, so backpatch to all supported versions like that
commit.

src/backend/access/transam/twophase.c

index cf0a6c40625b077e94eea53cf4937c371f30791e..d26668db8b60b7065dcc544b0f1064e80622db43 100644 (file)
@@ -2018,6 +2018,12 @@ RecoverPreparedTransactions(void)
                        if (InHotStandby)
                                StandbyReleaseLockTree(xid, hdr->nsubxacts, subxids);
 
+                       /*
+                        * We're done with recovering this transaction. Clear MyLockedGxact,
+                        * like we do in PrepareTransaction() during normal operation.
+                        */
+                       PostPrepare_Twophase();
+
                        pfree(buf);
                }
        }