database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix race condition that lead to WALInsertLock deadlock with commit_delay.

Browse Source 
If a call to WaitForXLogInsertionsToFinish() returned a value in the middle
of a page, and another backend then started to insert a record to the same
page, and then you called WaitXLogInsertionsToFinish() again, the second
call might return a smaller value than the first call. The problem was in
GetXLogBuffer(), which always updated the insertingAt value to the
beginning of the requested page, not the actual requested location. Because
of that, the second call might return a xlog pointer to the beginning of
the page, while the first one returned a later position on the same page.
XLogFlush() performs two calls to WaitXLogInsertionsToFinish() in
succession, and holds WALWriteLock on the second call, which can deadlock
if the second call to WaitXLogInsertionsToFinish() blocks.

Reported by Spiros Ioannou. Backpatch to 9.4, where the more scalable
WALInsertLock mechanism, and this bug, was introduced.
This commit is contained in:
Heikki Linnakangas 2015-08-02 20:08:10 +03:00
parent a4b09af3e9
commit 358cde320b
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/access/transam/xlog.c
View File

@ -1664,11 +1664,32 @@ GetXLogBuffer(XLogRecPtr ptr)
endptr = XLogCtl->xlblocks[idx]; endptr = XLogCtl->xlblocks[idx];
if (expectedEndPtr != endptr) if (expectedEndPtr != endptr)
{ {
XLogRecPtr initializedUpto;
/* /*
* Let others know that we're finished inserting the record up to the * Before calling AdvanceXLInsertBuffer(), which can block, let others
* page boundary. * know how far we're finished with inserting the record.
*
* NB: If 'ptr' points to just after the page header, advertise a
* position at the beginning of the page rather than 'ptr' itself. If
* there are no other insertions running, someone might try to flush
* up to our advertised location. If we advertised a position after
* the page header, someone might try to flush the page header, even
* though page might actually not be initialized yet. As the first
* inserter on the page, we are effectively responsible for making
* sure that it's initialized, before we let insertingAt to move past
* the page header.
*/ */
WALInsertLockUpdateInsertingAt(expectedEndPtr - XLOG_BLCKSZ); if (ptr % XLOG_BLCKSZ == SizeOfXLogShortPHD &&
ptr % XLOG_SEG_SIZE > XLOG_BLCKSZ)
initializedUpto = ptr - SizeOfXLogShortPHD;
else if (ptr % XLOG_BLCKSZ == SizeOfXLogLongPHD &&
ptr % XLOG_SEG_SIZE < XLOG_BLCKSZ)
initializedUpto = ptr - SizeOfXLogLongPHD;
else
initializedUpto = ptr;
WALInsertLockUpdateInsertingAt(initializedUpto);
AdvanceXLInsertBuffer(ptr, false); AdvanceXLInsertBuffer(ptr, false);
endptr = XLogCtl->xlblocks[idx]; endptr = XLogCtl->xlblocks[idx];