git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Report expected contrecord length on mismatch

author Alvaro Herrera <alvherre@alvh.no-ip.org>

Fri, 4 Sep 2020 18:58:32 +0000 (14:58 -0400)

committer Alvaro Herrera <alvherre@alvh.no-ip.org>

Fri, 4 Sep 2020 18:58:32 +0000 (14:58 -0400)

When reading a WAL record fails to find continuation record(s) of the
proper length, report what it expects, for clarity.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/20200903212152.GA15319@alvherre.pgsql

src/backend/access/transam/xlogreader.c patch | blob | blame | history

diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c

index 67996018da27690f84eda75cc9238fbfea96446a..a63ad8cfd0bfc594a38b1aac027d3e8cf7174a51 100644 (file)

--- a/src/backend/access/transam/xlogreader.c

+++ b/src/backend/access/transam/xlogreader.c

@@ -464,8 +464,9 @@ XLogReadRecord(XLogReaderState *state, char **errormsg)

total_len != (pageHeader->xlp_rem_len + gotlen))

{

report_invalid_record(state,

- "invalid contrecord length %u at %X/%X",

+ "invalid contrecord length %u (expected %lld) at %X/%X",

pageHeader->xlp_rem_len,

+ ((long long) total_len) - gotlen,

(uint32) (RecPtr >> 32), (uint32) RecPtr);

goto err;

}

This is the main PostgreSQL git repository.

RSS Atom