mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
Properly terminate the array returned by GetLockConflicts().
GetLockConflicts() has for a long time not properly terminated the returned array. During normal processing the returned array is zero initialized which, while not pretty, is sufficient to be recognized as a invalid virtual transaction id. But the HotStandby case is more than aesthetically broken: The allocated (and reused) array is neither zeroed upon allocation, nor reinitialized, nor terminated. Not having a terminating element means that the end of the array will not be recognized and that recovery conflict handling will thus read ahead into adjacent memory. Only terminating when hitting memory content that looks like a invalid virtual transaction id. Luckily this seems so far not have caused significant problems, besides making recovery conflict more expensive. Discussion: 20150127142713.GD29457@awork2.anarazel.de Backpatch into all supported branches.
This commit is contained in:
parent
ed127002d8
commit
17792bfc5b
@ -2804,6 +2804,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
|
|||||||
* on this lockable object.
|
* on this lockable object.
|
||||||
*/
|
*/
|
||||||
LWLockRelease(partitionLock);
|
LWLockRelease(partitionLock);
|
||||||
|
vxids[count].backendId = InvalidBackendId;
|
||||||
|
vxids[count].localTransactionId = InvalidLocalTransactionId;
|
||||||
return vxids;
|
return vxids;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2857,6 +2859,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
|
|||||||
if (count > MaxBackends) /* should never happen */
|
if (count > MaxBackends) /* should never happen */
|
||||||
elog(PANIC, "too many conflicting locks found");
|
elog(PANIC, "too many conflicting locks found");
|
||||||
|
|
||||||
|
vxids[count].backendId = InvalidBackendId;
|
||||||
|
vxids[count].localTransactionId = InvalidLocalTransactionId;
|
||||||
return vxids;
|
return vxids;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user