Fix deadlock at startup, if max_prepared_transactions is too small.

hlinnaka · hlinnaka · commit d3f5d2892bc7 · 2015-04-23T21:36:50.000+03:00
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.
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2055,6 +2055,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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2055,6 +2055,12 @@ RecoverPreparedTransactions(void)`
`2055`	`2055`	`if (InHotStandby)`
`2056`	`2056`	`StandbyReleaseLockTree(xid, hdr->nsubxacts, subxids);`
`2057`	`2057`
	`2058`	`+ /*`
	`2059`	`+ * We're done with recovering this transaction. Clear MyLockedGxact,`
	`2060`	`+ * like we do in PrepareTransaction() during normal operation.`
	`2061`	`+ */`
	`2062`	`+ PostPrepare_Twophase();`
	`2063`	`+`
`2058`	`2064`	`pfree(buf);`
`2059`	`2065`	`}`
`2060`	`2066`	`}`