summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2021-11-11 17:10:18 -0800
committerNoah Misch <noah@leadboat.com>2021-11-11 17:11:19 -0800
commit2f60fd647d8103b838530cbe9587956c96553ff7 (patch)
tree804b194740cb8f92293ea2dd70be35393bb7e06b /src/backend
parent7653f6f5f53f146b140b507b8651d107ff6957d0 (diff)
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
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/transam/twophase.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 62bf7b4d44f..3eb33be69b8 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1387,11 +1387,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)