postgres.git / summary / log / commit / refs

commit    71e3cff2e5956f3edf6d99039dab0424eb82be94
Author:   Simon Riggs <simon@2ndQuadrant.com>
Date:     Fri Feb 19 08:33:33 2016 +0000

    Correct StartupSUBTRANS for page wraparound
    
    StartupSUBTRANS() incorrectly handled cases near the max pageid in the subtrans
    data structure, which in some cases could lead to errors in startup for Hot
    Standby.
    This patch wraps the pageids correctly, avoiding any such errors.
    Identified by exhaustive crash testing by Jeff Janes.
    
    Jeff Janes


 src/backend/access/transam/subtrans.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index a9e4d31ce44..4e974bb44f1 100644
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -44,7 +44,8 @@
  * 0xFFFFFFFF/SUBTRANS_XACTS_PER_PAGE, and segment numbering at
  * 0xFFFFFFFF/SUBTRANS_XACTS_PER_PAGE/SLRU_PAGES_PER_SEGMENT.  We need take no
  * explicit notice of that fact in this module, except when comparing segment
- * and page numbers in TruncateSUBTRANS (see SubTransPagePrecedes).
+ * and page numbers in TruncateSUBTRANS (see SubTransPagePrecedes) and zeroing
+ * them in StartupSUBTRANS.
  */
 
 /* We need four bytes per xact */
@@ -253,6 +254,9 @@ StartupSUBTRANS(TransactionId oldestActiveXID)
 	{
 		(void) ZeroSUBTRANSPage(startPage);
 		startPage++;
+		/* must account for wraparound */
+		if (startPage > TransactionIdToPage(MaxTransactionId))
+			startPage=0;
 	}
 	(void) ZeroSUBTRANSPage(startPage);
 


[parent: bf26c4f443a8]