From 41d611588e862179eb9657406e0099acba253e7d Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Mon, 4 Oct 2021 00:44:31 -0400 Subject: [PATCH v41 1/7] Create XLogAcceptWrites() function with code from StartupXLOG(). This is just code movement. A future patch will want to defer the call to XLogAcceptWrites() until a later time, rather than doing it as soon as we finish applying WAL, but here we're just grouping related code together into a new function. Robert Haas, with modifications by Amul Sul. --- src/backend/access/transam/xlog.c | 112 +++++++++++++++++------------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5cda30836f8..163503bb87e 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -948,6 +948,8 @@ static XLogRecord *ReadRecord(XLogReaderState *xlogreader, int emode, bool fetching_ckpt, TimeLineID replayTLI); static void CheckRecoveryConsistency(void); +static bool XLogAcceptWrites(TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog, + TimeLineID ThisTimeLineID); static bool PerformRecoveryXLogAction(void); static XLogRecord *ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, int whichChkpt, bool report, @@ -8141,53 +8143,8 @@ StartupXLOG(void) } XLogReaderFree(xlogreader); - /* Enable WAL writes for this backend only. */ - LocalSetXLogInsertAllowed(); - - /* If necessary, write overwrite-contrecord before doing anything else */ - if (!XLogRecPtrIsInvalid(abortedRecPtr)) - { - Assert(!XLogRecPtrIsInvalid(missingContrecPtr)); - CreateOverwriteContrecordRecord(abortedRecPtr); - abortedRecPtr = InvalidXLogRecPtr; - missingContrecPtr = InvalidXLogRecPtr; - } - - /* - * Update full_page_writes in shared memory and write an XLOG_FPW_CHANGE - * record before resource manager writes cleanup WAL records or checkpoint - * record is written. - */ - Insert->fullPageWrites = lastFullPageWrites; - UpdateFullPageWrites(); - - /* - * Emit checkpoint or end-of-recovery record in XLOG, if required. - * - * XLogCtl->lastReplayedEndRecPtr will be a valid LSN if and only if we - * entered recovery. Even if we ultimately replayed no WAL records, it will - * have been initialized based on where replay was due to start. We don't - * need a lock to access this, since this can't change any more by the time - * we reach this code. - */ - if (!XLogRecPtrIsInvalid(XLogCtl->lastReplayedEndRecPtr)) - promoted = PerformRecoveryXLogAction(); - - /* - * If any of the critical GUCs have changed, log them before we allow - * backends to write WAL. - */ - XLogReportParameters(); - - /* If this is archive recovery, perform post-recovery cleanup actions. */ - if (ArchiveRecoveryRequested) - CleanupAfterArchiveRecovery(EndOfLogTLI, EndOfLog, ThisTimeLineID); - - /* - * Local WAL inserts enabled, so it's time to finish initialization of - * commit timestamp. - */ - CompleteCommitTsInitialization(); + /* Prepare to accept WAL writes. */ + promoted = XLogAcceptWrites(EndOfLogTLI, EndOfLog, ThisTimeLineID); /* * All done with end-of-recovery actions. @@ -8243,6 +8200,67 @@ StartupXLOG(void) RequestCheckpoint(CHECKPOINT_FORCE); } +/* + * Prepare to accept WAL writes. + */ +static bool +XLogAcceptWrites(TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog, + TimeLineID ThisTimeLineID) +{ + bool promoted = false; + XLogCtlInsert *Insert = &XLogCtl->Insert; + + /* Enable WAL writes for this backend only. */ + LocalSetXLogInsertAllowed(); + + /* If necessary, write overwrite-contrecord before doing anything else */ + if (!XLogRecPtrIsInvalid(abortedRecPtr)) + { + Assert(!XLogRecPtrIsInvalid(missingContrecPtr)); + CreateOverwriteContrecordRecord(abortedRecPtr); + abortedRecPtr = InvalidXLogRecPtr; + missingContrecPtr = InvalidXLogRecPtr; + } + + /* + * Update full_page_writes in shared memory and write an XLOG_FPW_CHANGE + * record before resource manager writes cleanup WAL records or checkpoint + * record is written. + */ + Insert->fullPageWrites = lastFullPageWrites; + UpdateFullPageWrites(); + + /* + * Emit checkpoint or end-of-recovery record in XLOG, if required. + * + * XLogCtl->lastReplayedEndRecPtr will be a valid LSN if and only if we + * entered recovery. Even if we ultimately replayed no WAL records, it will + * have been initialized based on where replay was due to start. We don't + * need a lock to access this, since this can't change any more by the time + * we reach this code. + */ + if (!XLogRecPtrIsInvalid(XLogCtl->lastReplayedEndRecPtr)) + promoted = PerformRecoveryXLogAction(); + + /* + * If any of the critical GUCs have changed, log them before we allow + * backends to write WAL. + */ + XLogReportParameters(); + + /* If this is archive recovery, perform post-recovery cleanup actions. */ + if (ArchiveRecoveryRequested) + CleanupAfterArchiveRecovery(EndOfLogTLI, EndOfLog, ThisTimeLineID); + + /* + * Local WAL inserts enabled, so it's time to finish initialization of + * commit timestamp. + */ + CompleteCommitTsInitialization(); + + return promoted; +} + /* * Checks if recovery has reached a consistent state. When consistency is * reached and we have a valid starting standby snapshot, tell postmaster -- 2.18.0