open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add LSN location in some error messages related to WAL pages

Browse Source 
The error messages reported during any failures while reading or
validating the header of a WAL currently includes only the offset of the
page but not the compiled LSN referring to the page, requiring an extra
step to compile it if looking at the surroundings with pg_waldump or
similar.  Adding this information costs a bit in translation, but also
eases debugging.

Author: Bharath Rupireddy
Reviewed-by:  Álvaro Herrera, Kyotaro Horiguchi, Maxim Orlov, Michael
Paquier
Discussion: https://postgr.es/m/CALj2ACWV=FCddsxcGbVOA=cvPyMr75YCFbSQT6g4KDj=gcJK4g@mail.gmail.com
pull/112/head
Michael Paquier 3 years ago
parent 8692f6644e
commit 71cb84ec69
2 changed files with 18 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      src/backend/access/transam/xlogreader.c
  2. 13
      src/backend/access/transam/xlogrecovery.c

15
src/backend/access/transam/xlogreader.c
Unescape View File

@ -1226,9 +1226,10 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize);
report_invalid_record(state, report_invalid_record(state,
"invalid magic number %04X in WAL segment %s, offset %u", "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u",
hdr->xlp_magic, hdr->xlp_magic,
fname, fname,
LSN_FORMAT_ARGS(recptr),
offset); offset);
return false; return false;
} }
@ -1240,9 +1241,10 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize);
report_invalid_record(state, report_invalid_record(state,
"invalid info bits %04X in WAL segment %s, offset %u", "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u",
hdr->xlp_info, hdr->xlp_info,
fname, fname,
LSN_FORMAT_ARGS(recptr),
offset); offset);
return false; return false;
} }
@ -1281,9 +1283,10 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
/* hmm, first page of file doesn't have a long header? */ /* hmm, first page of file doesn't have a long header? */
report_invalid_record(state, report_invalid_record(state,
"invalid info bits %04X in WAL segment %s, offset %u", "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u",
hdr->xlp_info, hdr->xlp_info,
fname, fname,
LSN_FORMAT_ARGS(recptr),
offset); offset);
return false; return false;
} }
@ -1300,9 +1303,10 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize);
report_invalid_record(state, report_invalid_record(state,
"unexpected pageaddr %X/%X in WAL segment %s, offset %u", "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u",
LSN_FORMAT_ARGS(hdr->xlp_pageaddr), LSN_FORMAT_ARGS(hdr->xlp_pageaddr),
fname, fname,
LSN_FORMAT_ARGS(recptr),
offset); offset);
return false; return false;
} }
@ -1325,10 +1329,11 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr,
XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize);
report_invalid_record(state, report_invalid_record(state,
"out-of-sequence timeline ID %u (after %u) in WAL segment %s, offset %u", "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u",
hdr->xlp_tli, hdr->xlp_tli,
state->latestPageTLI, state->latestPageTLI,
fname, fname,
LSN_FORMAT_ARGS(recptr),
offset); offset);
return false; return false;
} }

13
src/backend/access/transam/xlogrecovery.c
Unescape View File

@ -3075,9 +3075,10 @@ ReadRecord(XLogPrefetcher *xlogprefetcher, int emode,
XLogFileName(fname, xlogreader->seg.ws_tli, segno, XLogFileName(fname, xlogreader->seg.ws_tli, segno,
wal_segment_size); wal_segment_size);
ereport(emode_for_corrupt_record(emode, xlogreader->EndRecPtr), ereport(emode_for_corrupt_record(emode, xlogreader->EndRecPtr),
(errmsg("unexpected timeline ID %u in WAL segment %s, offset %u", (errmsg("unexpected timeline ID %u in WAL segment %s, LSN %X/%X, offset %u",
xlogreader->latestPageTLI, xlogreader->latestPageTLI,
fname, fname,
LSN_FORMAT_ARGS(xlogreader->latestPagePtr),
offset))); offset)));
record = NULL; record = NULL;
} }
@ -3280,14 +3281,16 @@ retry:
errno = save_errno; errno = save_errno;
ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen), ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen),
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not read from WAL segment %s, offset %u: %m", errmsg("could not read from WAL segment %s, LSN %X/%X, offset %u: %m",
fname, readOff))); fname, LSN_FORMAT_ARGS(targetPagePtr),
readOff)));
} }
else else
ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen), ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen),
(errcode(ERRCODE_DATA_CORRUPTED), (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("could not read from WAL segment %s, offset %u: read %d of %zu", errmsg("could not read from WAL segment %s, LSN %X/%X, offset %u: read %d of %zu",
fname, readOff, r, (Size) XLOG_BLCKSZ))); fname, LSN_FORMAT_ARGS(targetPagePtr),
readOff, r, (Size) XLOG_BLCKSZ)));
goto next_record_is_invalid; goto next_record_is_invalid;
} }
pgstat_report_wait_end(); pgstat_report_wait_end();

Write Preview
Loading…
Cancel
Save