database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Report any XLogReadRecord() error in XlogReadTwoPhaseData().

Browse Source 
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
This commit is contained in:
Noah Misch 2021-11-11 17:10:18 -08:00
parent 42f9427aa9
commit 3354746910
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/access/transam/twophase.c
View File

@ -1397,10 +1397,18 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
record = XLogReadRecord(xlogreader, &errormsg); record = XLogReadRecord(xlogreader, &errormsg);
if (record == NULL) if (record == NULL)
ereport(ERROR, {
(errcode_for_file_access(), if (errormsg)
errmsg("could not read two-phase state from WAL at %X/%X", ereport(ERROR,
LSN_FORMAT_ARGS(lsn)))); (errcode_for_file_access(),
errmsg("could not read two-phase state from WAL at %X/%X: %s",
LSN_FORMAT_ARGS(lsn), errormsg)));
else
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not read two-phase state from WAL at %X/%X",
LSN_FORMAT_ARGS(lsn))));
}
if (XLogRecGetRmid(xlogreader) != RM_XACT_ID || if (XLogRecGetRmid(xlogreader) != RM_XACT_ID ||
(XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE) (XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE)