database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

Fix off-by-one error in calculating subtrans/multixact truncation point.

Browse Source 
If there were no subtransactions (or multixacts) active, we would calculate
the oldestxid == next xid. That's correct, but if next XID happens to be
on the next pg_subtrans (pg_multixact) page, the page does not exist yet,
and SimpleLruTruncate will produce an "apparent wraparound" warning. The
warning is harmless in this case, but looks very alarming to users.

Backpatch to all supported versions. Patch and analysis by Thomas Munro.
This commit is contained in:
Heikki Linnakangas 2015-07-23 01:30:15 +03:00
parent 3cb6ef9983
commit 84330d0c1f
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/access/transam/multixact.c
View File

@ -89,6 +89,8 @@
#define MXOffsetToMemberEntry(xid) \
((xid) % (TransactionId) MULTIXACT_MEMBERS_PER_PAGE)
#define PreviousMultiXactId(xid) \
((xid) == FirstMultiXactId ? MaxMultiXactId : (xid) - 1)
/*
* Links to shared-memory data structures for MultiXact control
@ -1907,17 +1909,21 @@ TruncateMultiXact(void)
}
/*
* The cutoff point is the start of the segment containing oldestMXact. We
* pass the *page* containing oldestMXact to SimpleLruTruncate.
* The cutoff point is the start of the segment containing oldestMXact.
* We step back one multixact to avoid passing a cutoff page that hasn't
* been created yet in the rare case that oldestMXact would be the first
* item on a page and oldestMXact == nextMXact. In that case, if we
* didn't subtract one, we'd trigger SimpleLruTruncate's wraparound
* detection.
*/
cutoffPage = MultiXactIdToOffsetPage(oldestMXact);
cutoffPage = MultiXactIdToOffsetPage(PreviousMultiXactId(oldestMXact));
SimpleLruTruncate(MultiXactOffsetCtl, cutoffPage);
/*
* Also truncate MultiXactMember at the previously determined offset.
*/
cutoffPage = MXOffsetToMemberPage(oldestOffset);
cutoffPage = MXOffsetToMemberPage(oldestOffset - 1);
SimpleLruTruncate(MultiXactMemberCtl, cutoffPage);

7
src/backend/access/transam/subtrans.c
View File

@ -340,8 +340,13 @@ TruncateSUBTRANS(TransactionId oldestXact)
/*
* The cutoff point is the start of the segment containing oldestXact. We
* pass the *page* containing oldestXact to SimpleLruTruncate.
* pass the *page* containing oldestXact to SimpleLruTruncate. We step
* back one transaction to avoid passing a cutoff page that hasn't been
* created yet in the rare case that oldestXact would be the first item on
* a page and oldestXact == next XID. In that case, if we didn't subtract
* one, we'd trigger SimpleLruTruncate's wraparound detection.
*/
TransactionIdRetreat(oldestXact);
cutoffPage = TransactionIdToPage(oldestXact);
SimpleLruTruncate(SubTransCtl, cutoffPage);

1
src/include/access/multixact.h
View File

@ -15,6 +15,7 @@
#define InvalidMultiXactId ((MultiXactId) 0)
#define FirstMultiXactId ((MultiXactId) 1)
#define MaxMultiXactId ((MultiXactId) 0xFFFFFFFF)
#define MultiXactIdIsValid(multi) ((multi) != InvalidMultiXactId)