postgres.git / summary / log / commit / refs

commit    d4e9d6946995cceaed97ee4570c4c867b3ea2104
Author:   Noah Misch <noah@leadboat.com>
Date:     Fri Nov 12 01:10:18 2021 +0000
First released in: 15.0, 10.20, 11.15, 12.10, 13.6, 14.2

    Report any XLogReadRecord() error in XlogReadTwoPhaseData().
    
    Buildfarm members kittiwake and tadarida have witnessed errors at this
    site.  The site discarded key facts.  Back-patch to v10 (all supported
    versions).
    
    Reviewed by Michael Paquier and Tom Lane.
    
    Discussion: https://postgr.es/m/20211107013157.GB790288@rfd.leadboat.com


 src/backend/access/transam/twophase.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index b42a45b4082..ba11b533146 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1414,11 +1414,21 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
 	ThisTimeLineID = save_currtli;
 
 	if (record == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not read two-phase state from WAL at %X/%X",
-						(uint32) (lsn >> 32),
-						(uint32) lsn)));
+	{
+		if (errormsg)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not read two-phase state from WAL at %X/%X: %s",
+							(uint32) (lsn >> 32),
+							(uint32) lsn,
+							errormsg)));
+		else
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not read two-phase state from WAL at %X/%X",
+							(uint32) (lsn >> 32),
+							(uint32) lsn)));
+	}
 
 	if (XLogRecGetRmid(xlogreader) != RM_XACT_ID ||
 		(XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE)


[parent: 13c8adf90e9d]