From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 22 Jul 2015 22:30:19 +0000 (+0300)
Subject: Fix off-by-one error in calculating subtrans/multixact truncation point.
X-Git-Tag: REL9_0_23~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40ad7822019a2cf8b9e0d5bd770490af7b56e652;p=thirdparty%2Fpostgresql.git

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

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.
---

diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 5369dbae324..a26d508a4d2 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -90,6 +90,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
@@ -1902,17 +1904,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);
 
diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index 05d3f93c9fe..97511a0c702 100644
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -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);
diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h
index 3a21033f535..5f035329361 100644
--- a/src/include/access/multixact.h
+++ b/src/include/access/multixact.h
@@ -15,6 +15,7 @@
 
 #define InvalidMultiXactId	((MultiXactId) 0)
 #define FirstMultiXactId	((MultiXactId) 1)
+#define MaxMultiXactId		((MultiXactId) 0xFFFFFFFF)
 
 #define MultiXactIdIsValid(multi) ((multi) != InvalidMultiXactId)