aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Munro <tmunro@postgresql.org>2023-07-03 10:53:44 +1200
committerThomas Munro <tmunro@postgresql.org>2023-07-03 11:21:56 +1200
commit76d5966b3b798cc58025c77164fa944f2b6dd667 (patch)
tree10faa821235f31d5fbee1a37196df55feccb1399
parent9cf85093b55979e7d8ccfd9d0da21ce277a2f321 (diff)
downloadpostgresql-76d5966b3b798cc58025c77164fa944f2b6dd667.tar.gz
postgresql-76d5966b3b798cc58025c77164fa944f2b6dd667.zip
Silence "missing contrecord" error.
Commit dd38ff28ad added a new error message "missing contrecord" when we fail to reassemble a record. Unfortunately that caused noisy messages to be logged by pg_waldump at end of segment, and by walsender when asked to shut down on a segment boundary. Remove the new error message, so that this condition signals end-of- WAL without a message. It's arguably a reportable condition that should not be silenced while performing crash recovery, but fixing that without introducing noise in the other cases will require more research. Back-patch to 15. Reported-by: Tomas Vondra <tomas.vondra@enterprisedb.com> Discussion: https://postgr.es/m/6a1df56e-4656-b3ce-4b7a-a9cb41df8189%40enterprisedb.com
-rw-r--r--src/backend/access/transam/xlogreader.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 2e7b1ba8e18..c9f9f6e98f0 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -914,15 +914,11 @@ err:
state->missingContrecPtr = targetPagePtr;
/*
- * If we got here without reporting an error, report one now so that
- * XLogPrefetcherReadRecord() doesn't bring us back a second time and
- * clobber the above state. Otherwise, the existing error takes
- * precedence.
+ * If we got here without reporting an error, make sure an error is
+ * queued so that XLogPrefetcherReadRecord() doesn't bring us back a
+ * second time and clobber the above state.
*/
- if (!state->errormsg_buf[0])
- report_invalid_record(state,
- "missing contrecord at %X/%X",
- LSN_FORMAT_ARGS(RecPtr));
+ state->errormsg_deferred = true;
}
if (decoded && decoded->oversized)