Fix assertion failure when running pgbench -s.
authorFujii Masao
Thu, 7 Nov 2019 07:31:36 +0000 (16:31 +0900)
committerFujii Masao
Thu, 7 Nov 2019 07:32:37 +0000 (16:32 +0900)
If there is the WAL page that the continuation WAL record just fits within
(i.e., the continuation record ends just at the end of the page) and
the LSN in such page is specified with -s option, previously pg_waldump
caused an assertion failure. The cause of this assertion failure was that
XLogFindNextRecord() that pg_waldump -s calls mistakenly handled
such special WAL page.

This commit changes XLogFindNextRecord() so that it can handle
such WAL page correctly.

Back-patch to all supported versions.

Author: Andrey Lepikhov
Reviewed-by: Fujii Masao, Michael Paquier
Discussion: https://postgr.es/m/99303554-5dd5-06e6-f943-b3005ccd6edd@postgrespro.ru

src/backend/access/transam/xlogreader.c

index 88be7fe022395819156a67165a6a770500d38e0b..7d40029b083dbf4f411cfe6fb02502e3de768f6b 100644 (file)
@@ -955,7 +955,7 @@ XLogFindNextRecord(XLogReaderState *state, XLogRecPtr RecPtr)
             *
             * Note that record headers are MAXALIGN'ed
             */
-           if (MAXALIGN(header->xlp_rem_len) > (XLOG_BLCKSZ - pageHeaderSize))
+           if (MAXALIGN(header->xlp_rem_len) >= (XLOG_BLCKSZ - pageHeaderSize))
                tmpRecPtr = targetPagePtr + XLOG_BLCKSZ;
            else
            {