From d54531aa2774bad7e426cc16691553fbc8f0b3b3 Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Mon, 14 Dec 2020 11:18:08 +0900 Subject: [PATCH] Don't cancel invalid-page-header error in unwanted situation The commit 0668719801 is intending to work while streaming replication but it cancels the error message regardless of the context. As the result ReadRecord fails to show the correct error messages even when it is required, that is, not while replication. Allowing the cancellation happen only on non-standby fixes that. --- src/backend/access/transam/xlog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 7e81ce4f17..770902518d 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -12055,7 +12055,8 @@ retry: * Validating the page header is cheap enough that doing it twice * shouldn't be a big deal from a performance point of view. */ - if (!XLogReaderValidatePageHeader(xlogreader, targetPagePtr, readBuf)) + if (StandbyMode && + !XLogReaderValidatePageHeader(xlogreader, targetPagePtr, readBuf)) { /* reset any error XLogReaderValidatePageHeader() might have set */ xlogreader->errormsg_buf[0] = '\0'; -- 2.27.0