diff options
| author | Noah Misch <noah@leadboat.com> | 2021-11-11 17:10:18 -0800 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2021-11-11 17:10:18 -0800 |
| commit | 335474691054a74d771f0e7c24d25e800e3a37b6 (patch) | |
| tree | 0d844ba798c90f22364620ee2b2b52331586c530 /src | |
| parent | 42f9427aa98a2245d29737e0f3b8aaf39a7f57ec (diff) | |
| download | postgresql-335474691054a74d771f0e7c24d25e800e3a37b6.tar.gz postgresql-335474691054a74d771f0e7c24d25e800e3a37b6.zip | |
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')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index ef4b5f639ce..28b153abc3c 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -1397,10 +1397,18 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len) record = XLogReadRecord(xlogreader, &errormsg); if (record == NULL) - ereport(ERROR, - (errcode_for_file_access(), - errmsg("could not read two-phase state from WAL at %X/%X", - LSN_FORMAT_ARGS(lsn)))); + { + if (errormsg) + ereport(ERROR, + (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 || (XLogRecGetInfo(xlogreader) & XLOG_XACT_OPMASK) != XLOG_XACT_PREPARE) |