Be sure to release proc->backendLock after SetupLockInTable() failure.

tglsfdc · tglsfdc · commit 360abc0a5be6 · 2013-11-29T17:35:12.000-05:00
The various places that transferred fast-path locks to the main lock table
neglected to release the PGPROC's backendLock if SetupLockInTable failed
due to being out of shared memory.  In most cases this is no big deal since
ensuing error cleanup would release all held LWLocks anyway.  But there are
some hot-standby functions that don't consider failure of
FastPathTransferRelationLocks to be a hard error, and in those cases this
oversight could lead to system lockup.  For consistency, make all of these
places look the same as FastPathTransferRelationLocks.

Noted while looking for the cause of Dan Wood's bugs --- this wasn't it,
but it's a bug anyway.
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -2537,6 +2537,7 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag
 				if (!proclock)
 				{
 					LWLockRelease(partitionLock);
+					LWLockRelease(proc->backendLock);
 					return false;
 				}
 				GrantLock(proclock->tag.myLock, proclock, lockmode);
@@ -2592,6 +2593,7 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock)
 		if (!proclock)
 		{
 			LWLockRelease(partitionLock);
+			LWLockRelease(MyProc->backendLock);
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of shared memory"),
@@ -4055,6 +4057,7 @@ VirtualXactLock(VirtualTransactionId vxid, bool wait)
 		if (!proclock)
 		{
 			LWLockRelease(partitionLock);
+			LWLockRelease(proc->backendLock);
 			ereport(ERROR,
 					(errcode(ERRCODE_OUT_OF_MEMORY),
 					 errmsg("out of shared memory"),

Original file line number	Diff line number	Diff line change
`@@ -2537,6 +2537,7 @@ FastPathTransferRelationLocks(LockMethod lockMethodTable, const LOCKTAG *locktag`
`2537`	`2537`	`if (!proclock)`
`2538`	`2538`	`{`
`2539`	`2539`	`LWLockRelease(partitionLock);`
	`2540`	`+ LWLockRelease(proc->backendLock);`
`2540`	`2541`	`return false;`
`2541`	`2542`	`}`
`2542`	`2543`	`GrantLock(proclock->tag.myLock, proclock, lockmode);`
`@@ -2592,6 +2593,7 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock)`
`2592`	`2593`	`if (!proclock)`
`2593`	`2594`	`{`
`2594`	`2595`	`LWLockRelease(partitionLock);`
	`2596`	`+ LWLockRelease(MyProc->backendLock);`
`2595`	`2597`	`ereport(ERROR,`
`2596`	`2598`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`2597`	`2599`	`errmsg("out of shared memory"),`
`@@ -4055,6 +4057,7 @@ VirtualXactLock(VirtualTransactionId vxid, bool wait)`
`4055`	`4057`	`if (!proclock)`
`4056`	`4058`	`{`
`4057`	`4059`	`LWLockRelease(partitionLock);`
	`4060`	`+ LWLockRelease(proc->backendLock);`
`4058`	`4061`	`ereport(ERROR,`
`4059`	`4062`	`(errcode(ERRCODE_OUT_OF_MEMORY),`
`4060`	`4063`	`errmsg("out of shared memory"),`