From 4da892c00e78850eee9cdd4a5c9d0342846179cc Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Mon, 4 Oct 2021 00:44:31 -0400 Subject: [PATCH v45 1/6] 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 | 100 ++++++++++++++++++------------ 1 file changed, 61 insertions(+), 39 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 6770c3ddba..7e7e99a850 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -665,6 +665,10 @@ static void UpdateLastRemovedPtr(char *filename); static void ValidateXLOGDirectoryStructure(void); static void CleanupBackupHistory(void); static void UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force); +static bool XLogAcceptWrites(bool performedWalRecovery, TimeLineID newTLI, + TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog, + XLogRecPtr abortedRecPtr, + XLogRecPtr missingContrecPtr); static bool PerformRecoveryXLogAction(void); static void InitControlFile(uint64 sysidentifier); static void WriteControlFile(void); @@ -5527,45 +5531,9 @@ StartupXLOG(void) /* Shut down xlogreader */ ShutdownWalRecovery(); - /* 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, missingContrecPtr, newTLI); - } - - /* - * 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. - */ - if (performedWalRecovery) - 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, newTLI); - - /* - * Local WAL inserts enabled, so it's time to finish initialization of - * commit timestamp. - */ - CompleteCommitTsInitialization(); + /* Prepare to accept WAL writes. */ + promoted = XLogAcceptWrites(performedWalRecovery, newTLI, EndOfLogTLI, + EndOfLog, abortedRecPtr, missingContrecPtr); /* * All done with end-of-recovery actions. @@ -5620,6 +5588,60 @@ StartupXLOG(void) RequestCheckpoint(CHECKPOINT_FORCE); } +/* + * Prepare to accept WAL writes. + */ +static bool +XLogAcceptWrites(bool performedWalRecovery, TimeLineID newTLI, + TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog, + XLogRecPtr abortedRecPtr, XLogRecPtr missingContrecPtr) +{ + 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, missingContrecPtr, newTLI); + } + + /* + * 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. + */ + if (performedWalRecovery) + 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, newTLI); + + /* + * Local WAL inserts enabled, so it's time to finish initialization of + * commit timestamp. + */ + CompleteCommitTsInitialization(); + + return promoted; +} + /* * Callback from PerformWalRecovery(), called when we switch from crash * recovery to archive recovery mode. Updates the control file accordingly. -- 2.18.0