From d4e9d6946995cceaed97ee4570c4c867b3ea2104 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Thu, 11 Nov 2021 17:10:18 -0800 Subject: [PATCH] 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 b42a45b408..ba11b53314 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)