postgres.git / summary / log / commit / refs

commit    63fa0deb31c4b18a6dbf15fc8ff64ac010ea77b2
Author:   Peter Geoghegan <pg@bowt.ie>
Date:     Thu Jun 22 00:41:54 2023 +0000

    nbtree VACUUM: cope with topparent inconsistencies.
    
    Avoid "right sibling %u of block %u is not next child" errors when
    vacuuming a corrupt nbtree index.  Just LOG the issue and press on.
    That way VACUUM will have a decent chance of finishing off all required
    processing for the index (and for the table as a whole).
    
    This is similar to recent work from commit 5abff197, as well as work
    from commit 5b861baa (later backpatched as commit 43e409ce), which
    taught nbtree VACUUM to keep going when its "re-find" check fails.  The
    hardening added by this commit takes place directly after the "re-find"
    check, right before the critical section for the first stage of page
    deletion.
    
    Author: Peter Geoghegan <pg@bowt.ie>
    Discussion: https://postgr.es/m/CAH2-Wz=dayg0vjs4+er84TS9ami=csdzjpuiCGbEw=idhwqhzQ@mail.gmail.com
    Backpatch: 11- (all supported versions).


 src/backend/access/nbtree/nbtpage.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 5d888bd72a8..7c9412aad82 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -2148,12 +2148,6 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 								 &topparent, &topparentrightsib))
 		return false;
 
-	/*
-	 * Check that the parent-page index items we're about to delete/overwrite
-	 * in subtree parent page contain what we expect.  This can fail if the
-	 * index has become corrupt for some reason.  We want to throw any error
-	 * before entering the critical section --- otherwise it'd be a PANIC.
-	 */
 	page = BufferGetPage(subtreeparent);
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
@@ -2171,8 +2165,17 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 	nextoffset = OffsetNumberNext(poffset);
 	itemid = PageGetItemId(page, nextoffset);
 	itup = (IndexTuple) PageGetItem(page, itemid);
+
+	/*
+	 * Check that the parent-page index items we're about to delete/overwrite
+	 * in subtree parent page contain what we expect.  This can fail if the
+	 * index has become corrupt for some reason.  When that happens we back
+	 * out of deletion of the leafbuf subtree.  (This is just like the case
+	 * where _bt_lock_subtree_parent() cannot "re-find" leafbuf's downlink.)
+	 */
 	if (BTreeTupleGetDownLink(itup) != topparentrightsib)
-		ereport(ERROR,
+	{
+		ereport(LOG,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
 				 errmsg_internal("right sibling %u of block %u is not next child %u of block %u in index \"%s\"",
 								 topparentrightsib, topparent,
@@ -2180,6 +2183,11 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 								 BufferGetBlockNumber(subtreeparent),
 								 RelationGetRelationName(rel))));
 
+		_bt_relbuf(rel, subtreeparent);
+		Assert(false);
+		return false;
+	}
+
 	/*
 	 * Any insert which would have gone on the leaf block will now go to its
 	 * right sibling.  In other words, the key space moves right.
@@ -2834,6 +2842,7 @@ _bt_lock_subtree_parent(Relation rel, BlockNumber child, BTStack stack,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
 				 errmsg_internal("failed to re-find parent key in index \"%s\" for deletion target page %u",
 								 RelationGetRelationName(rel), child)));
+		Assert(false);
 		return false;
 	}
 


[parent: 43b28fc39f22]