diff options
| author | Noah Misch | 2021-06-29 01:34:55 +0000 |
|---|---|---|
| committer | Michael Paquier | 2025-04-06 05:36:08 +0000 |
| commit | 8967dddf086e81b0b5ee84a197cc2773f73e131a (patch) | |
| tree | 1135345e5be38c1516fc02e48986a3bde020ac9c | |
| parent | 6b168c1299c5da486c653e2456a87841d24b1ea7 (diff) | |
In XLogFileInit(), fix *use_existent postcondition to suit callers.
Infrequently, the mismatch caused log_checkpoints messages and
TRACE_POSTGRESQL_CHECKPOINT_DONE() to witness an "added" count too high
by one. Since that consequence is so minor, no back-patch.
This commit has been applied as of 85656bc3050f in v15 and newer
versions. This is required on stable branches of v13 and v14 to fix a
regression reported by Noah Misch, introduced by 1f95181b44c8, causing
spurious failures in archive recovery (neither streaming nor archive
recovery) with concurrent restartpoints. The backpatched versions of
the patches have been aligned on these branches by me, Noah Misch is the
author. Tests have been conducted by the both of us.
Reported-by: Arun Thirupathi
Author: Noah Misch <noah@leadboat.com>
Discussion: https://postgr.es/m/20210202151416.GB3304930@rfd.leadboat.com
Discussion: https://postgr.es/m/20250306193013.36.nmisch@google.com
Backpatch-through: 13
| -rw-r--r-- | src/backend/access/transam/xlog.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 20449820c7c..c9176eea68c 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -3289,8 +3289,8 @@ XLogNeedsFlush(XLogRecPtr record) * logsegno: identify segment to be created/opened. * * *use_existent: if true, OK to use a pre-existing file (else, any - * pre-existing file will be deleted). On return, true if a pre-existing - * file was used. + * pre-existing file will be deleted). On return, false iff this call added + * some segment on disk. * * Returns FD of opened file. * @@ -3459,8 +3459,10 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent) * CheckPointSegments. */ max_segno = logsegno + CheckPointSegments; - if (!InstallXLogFileSegment(&installed_segno, tmppath, - *use_existent, max_segno)) + if (InstallXLogFileSegment(&installed_segno, tmppath, + *use_existent, max_segno)) + *use_existent = false; + else { /* * No need for any more future segments, or InstallXLogFileSegment() @@ -3470,9 +3472,6 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent) unlink(tmppath); } - /* Set flag to tell caller there was no existent file */ - *use_existent = false; - /* Now open original target segment (might not be file I just made) */ fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method)); if (fd < 0) |