postgres.git / summary / log / commit / refs
commit 5f472ab564d153a047eb3f7d3edf2c8388899ee9
Author: Fujii Masao <fujii@postgresql.org>
Date: Tue Nov 03 01:51:05 2026 +0000
First released in: 15.20, 16.16, 17.12, 18.7, 19.0
Fix incorrect LSNs in WAL decoding error messages
Commit 3f1ce97346 introduced a circular WAL decoding buffer,
allowing records to be decoded before they are consumed. However,
decoding error messages continued to report the location of the last
record consumed instead of the record that failed decoding. With
recovery prefetching, the reported location could be many records
behind the failing record, making WAL problems harder to diagnose.
Fix this by reporting the location of the record being decoded.
Errors now identify the failing record even with recovery prefetching,
making it easier to investigate malformed WAL during recovery or with
tools such as pg_waldump and pg_walinspect.
Backpatch to v15, where the WAL decoding buffer was introduced.
Author: Rahul Yadav <rahul@rhyadav.dev>
Reviewed-by: Surya Poondla <suryapoondla4@gmail.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/P2qIkq4--F-9@rhyadav.dev
Backpatch-through: 15
src/backend/access/transam/xlogreader.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 5bc659f89c3..5d507ccf0eb 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -1758,7 +1758,7 @@ DecodeXLogRecord(XLogReaderState *state,
report_invalid_record(state,
"out-of-order block_id %u at %X/%X",
block_id,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
decoded->max_block_id = block_id;
@@ -1781,7 +1781,7 @@ DecodeXLogRecord(XLogReaderState *state,
{
report_invalid_record(state,
"BKPBLOCK_HAS_DATA set, but no data included at %X/%X",
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
if (!blk->has_data && blk->data_len != 0)
@@ -1789,7 +1789,7 @@ DecodeXLogRecord(XLogReaderState *state,
report_invalid_record(state,
"BKPBLOCK_HAS_DATA not set, but data length is %u at %X/%X",
(unsigned int) blk->data_len,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
datatotal += blk->data_len;
@@ -1827,7 +1827,7 @@ DecodeXLogRecord(XLogReaderState *state,
(unsigned int) blk->hole_offset,
(unsigned int) blk->hole_length,
(unsigned int) blk->bimg_len,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
@@ -1842,7 +1842,7 @@ DecodeXLogRecord(XLogReaderState *state,
"BKPIMAGE_HAS_HOLE not set, but hole offset %u length %u at %X/%X",
(unsigned int) blk->hole_offset,
(unsigned int) blk->hole_length,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
@@ -1855,7 +1855,7 @@ DecodeXLogRecord(XLogReaderState *state,
report_invalid_record(state,
"BKPIMAGE_COMPRESSED set, but block image length %u at %X/%X",
(unsigned int) blk->bimg_len,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
@@ -1870,7 +1870,7 @@ DecodeXLogRecord(XLogReaderState *state,
report_invalid_record(state,
"neither BKPIMAGE_HAS_HOLE nor BKPIMAGE_COMPRESSED set, but block image length is %u at %X/%X",
(unsigned int) blk->bimg_len,
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
}
@@ -1885,7 +1885,7 @@ DecodeXLogRecord(XLogReaderState *state,
{
report_invalid_record(state,
"BKPBLOCK_SAME_REL set but no previous rel at %X/%X",
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
goto err;
}
@@ -1897,7 +1897,7 @@ DecodeXLogRecord(XLogReaderState *state,
{
report_invalid_record(state,
"invalid block_id %u at %X/%X",
- block_id, LSN_FORMAT_ARGS(state->ReadRecPtr));
+ block_id, LSN_FORMAT_ARGS(lsn));
goto err;
}
}
@@ -1964,7 +1964,7 @@ DecodeXLogRecord(XLogReaderState *state,
shortdata_err:
report_invalid_record(state,
"record with invalid length at %X/%X",
- LSN_FORMAT_ARGS(state->ReadRecPtr));
+ LSN_FORMAT_ARGS(lsn));
err:
*errormsg = state->errormsg_buf;
[parent: 6d34d5500e9d]