Skip to content

Commit 3406861

Browse files
Avoid early reuse of btree pages, causing incorrect query results.
When we allowed read-only transactions to skip assigning XIDs we introduced the possibility that a fully deleted btree page could be reused. This broke the index link sequence which could then lead to indexscans silently returning fewer rows than would have been correct. The actual incidence of silent errors from this is thought to be very low because of the exact workload required and locking pre-conditions. Fix is to remove pages only if index page opaque->btpo.xact precedes RecentGlobalXmin. Noah Misch, reviewed by Simon Riggs
1 parent eab246d commit 3406861

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

src/backend/access/nbtree/README

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,14 @@ we need to be sure we don't miss or re-scan any items.
261261

262262
A deleted page can only be reclaimed once there is no scan or search that
263263
has a reference to it; until then, it must stay in place with its
264-
right-link undisturbed. We implement this by waiting until all
265-
transactions that were running at the time of deletion are dead; which is
264+
right-link undisturbed. We implement this by waiting until all active
265+
snapshots and registered snapshots as of the deletion are gone; which is
266266
overly strong, but is simple to implement within Postgres. When marked
267267
dead, a deleted page is labeled with the next-transaction counter value.
268268
VACUUM can reclaim the page for re-use when this transaction number is
269-
older than the oldest open transaction.
269+
older than RecentGlobalXmin. As collateral damage, this implementation
270+
also waits for running XIDs with no snapshots and for snapshots taken
271+
until the next transaction to allocate an XID commits.
270272

271273
Reclaiming a page doesn't actually change its state on disk --- we simply
272274
record it in the shared-memory free space map, from which it will be

src/backend/access/nbtree/nbtpage.c

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -560,19 +560,9 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access)
560560
*/
561561
if (XLogStandbyInfoActive())
562562
{
563-
TransactionId latestRemovedXid;
564-
565563
BTPageOpaque opaque = (BTPageOpaque) PageGetSpecialPointer(page);
566564

567-
/*
568-
* opaque->btpo.xact is the threshold value not the
569-
* value to measure conflicts against. We must retreat
570-
* by one from it to get the correct conflict xid.
571-
*/
572-
latestRemovedXid = opaque->btpo.xact;
573-
TransactionIdRetreat(latestRemovedXid);
574-
575-
_bt_log_reuse_page(rel, blkno, latestRemovedXid);
565+
_bt_log_reuse_page(rel, blkno, opaque->btpo.xact);
576566
}
577567

578568
/* Okay to use page. Re-initialize and return it */
@@ -687,7 +677,6 @@ bool
687677
_bt_page_recyclable(Page page)
688678
{
689679
BTPageOpaque opaque;
690-
TransactionId cutoff;
691680

692681
/*
693682
* It's possible to find an all-zeroes page in an index --- for example, a
@@ -700,18 +689,11 @@ _bt_page_recyclable(Page page)
700689

701690
/*
702691
* Otherwise, recycle if deleted and too old to have any processes
703-
* interested in it. If we are generating records for Hot Standby
704-
* defer page recycling until RecentGlobalXmin to respect user
705-
* controls specified by vacuum_defer_cleanup_age or hot_standby_feedback.
692+
* interested in it.
706693
*/
707-
if (XLogStandbyInfoActive())
708-
cutoff = RecentGlobalXmin;
709-
else
710-
cutoff = RecentXmin;
711-
712694
opaque = (BTPageOpaque) PageGetSpecialPointer(page);
713695
if (P_ISDELETED(opaque) &&
714-
TransactionIdPrecedesOrEquals(opaque->btpo.xact, cutoff))
696+
TransactionIdPrecedes(opaque->btpo.xact, RecentGlobalXmin))
715697
return true;
716698
return false;
717699
}
@@ -1358,7 +1340,13 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack)
13581340

13591341
/*
13601342
* Mark the page itself deleted. It can be recycled when all current
1361-
* transactions are gone.
1343+
* transactions are gone. Storing GetTopTransactionId() would work, but
1344+
* we're in VACUUM and would not otherwise have an XID. Having already
1345+
* updated links to the target, ReadNewTransactionId() suffices as an
1346+
* upper bound. Any scan having retained a now-stale link is advertising
1347+
* in its PGPROC an xmin less than or equal to the value we read here. It
1348+
* will continue to do so, holding back RecentGlobalXmin, for the duration
1349+
* of that scan.
13621350
*/
13631351
page = BufferGetPage(buf);
13641352
opaque = (BTPageOpaque) PageGetSpecialPointer(page);

src/backend/access/nbtree/nbtxlog.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,11 @@ btree_redo(XLogRecPtr lsn, XLogRecord *record)
971971
/*
972972
* Btree reuse page records exist to provide a conflict point
973973
* when we reuse pages in the index via the FSM. That's all it
974-
* does though.
974+
* does though. latestRemovedXid was the page's btpo.xact. The
975+
* btpo.xact < RecentGlobalXmin test in _bt_page_recyclable()
976+
* conceptually mirrors the pgxact->xmin > limitXmin test in
977+
* GetConflictingVirtualXIDs(). Consequently, one XID value
978+
* achieves the same exclusion effect on master and standby.
975979
*/
976980
{
977981
xl_btree_reuse_page *xlrec = (xl_btree_reuse_page *) XLogRecGetData(record);

0 commit comments

Comments
 (0)