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:11:01 -0800 |
| commit | d4e9d6946995cceaed97ee4570c4c867b3ea2104 (patch) | |
| tree | 6acb614444e05aa6ebdef6536055138cb485b984 | |
| parent | 13c8adf90e9d9bc58209ab820775949336d901f7 (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
| -rw-r--r-- | src/backend/access/transam/twophase.c | 20 |
1 files 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) |