From 2ddb300040df38e2f8b90d36e613d99798e7a186 Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Thu, 30 Sep 2021 06:29:06 -0400 Subject: [PATCH v41 2/7] Remove dependencies on startup-process specifical variables. To make XLogAcceptWrites(), need to dependency on few global and local variable spcific to startup process. Global variables are abortedRecPtr, missingContrecPtr, ArchiveRecoveryRequested and LocalPromoteIsTriggered, whereas LocalPromoteIsTriggered can be accessed in any other process using existing PromoteIsTriggered(). abortedRecPtr & ArchiveRecoveryRequested is made accessible by copying into shared memory. missingContrecPtr can get from the existing shared memory values through XLogCtl->lastSegSwitchLSN, which is not going to change until we use it. That changes only when the current WAL segment gets full, there won't be any WAL write until that point. XLogAcceptWrites() accepts two argument as EndOfLogTLI and EndOfLog which are local to StartupXLOG(). Instead of passing as an argument XLogCtl->replayEndTLI and XLogCtl->replayEndRecPtr from the shared memory can be used as an replacement to EndOfLogTLI and EndOfLog respectively. EndOfLog will be changed if the abort record is exists and in that case, the missingContrecPtr point will be considered as the end of WAL since the further part going to be skipped anyway. EndOfLogTLI in the StartupXLOG() is the timeline ID of the last record that xlogreader reads, but this xlogreader was simply re-fetching the last record which we have replied in redo loop if it was in recovery, if not in recovery, we don't need to worry since this value is needed only in case of ArchiveRecoveryRequested = true, which implicitly forces redo and sets XLogCtl->replayEndTLI value. --- src/backend/access/transam/xlog.c | 85 ++++++++++++++++++++++++------- 1 file changed, 67 insertions(+), 18 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 163503bb87e..cbd415a5cfe 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -666,6 +666,13 @@ typedef struct XLogCtlData */ bool SharedPromoteIsTriggered; + /* + * SharedArchiveRecoveryRequested exports the value of the + * ArchiveRecoveryRequested flag to be share which is otherwise valid only + * in the startup process. + */ + bool SharedArchiveRecoveryRequested; + /* * WalWriterSleeping indicates whether the WAL writer is currently in * low-power mode (and hence should be nudged if an async commit occurs). @@ -715,6 +722,13 @@ typedef struct XLogCtlData /* timestamp of last COMMIT/ABORT record replayed (or being replayed) */ TimestampTz recoveryLastXTime; + /* + * SharedAbortedRecPtr exports abortedRecPtr to be shared with another + * process to write OVERWRITE_CONTRECORD message, if WAL writes are not + * permitted in the current process which reads that. + */ + XLogRecPtr SharedAbortedRecPtr; + /* * timestamp of when we started replaying the current chunk of WAL data, * only relevant for replication or archive recovery @@ -948,8 +962,7 @@ 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 XLogAcceptWrites(void); static bool PerformRecoveryXLogAction(void); static XLogRecord *ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, int whichChkpt, bool report, @@ -5330,7 +5343,9 @@ XLOGShmemInit(void) XLogCtl->SharedHotStandbyActive = false; XLogCtl->InstallXLogFileSegmentActive = false; XLogCtl->SharedPromoteIsTriggered = false; + XLogCtl->SharedArchiveRecoveryRequested = false; XLogCtl->WalWriterSleeping = false; + XLogCtl->SharedAbortedRecPtr = InvalidXLogRecPtr; SpinLockInit(&XLogCtl->Insert.insertpos_lck); SpinLockInit(&XLogCtl->info_lck); @@ -5609,6 +5624,11 @@ readRecoverySignalFile(void) ereport(FATAL, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("standby mode is not supported by single-user servers"))); + + /* + * Remember archive recovery request in shared memory state. + */ + XLogCtl->SharedArchiveRecoveryRequested = ArchiveRecoveryRequested; } static void @@ -8045,6 +8065,16 @@ StartupXLOG(void) { Assert(!XLogRecPtrIsInvalid(abortedRecPtr)); EndOfLog = missingContrecPtr; + + /* + * Remember broken record pointer in shared memory state. This process + * might unable to write an OVERWRITE_CONTRECORD message because of WAL + * write restriction. Storing in shared memory helps that get written + * later by another process as soon as WAL writing is enabled. + */ + XLogCtl->SharedAbortedRecPtr = abortedRecPtr; + abortedRecPtr = InvalidXLogRecPtr; + missingContrecPtr = InvalidXLogRecPtr; } /* @@ -8143,8 +8173,15 @@ StartupXLOG(void) } XLogReaderFree(xlogreader); + /* + * Update full_page_writes in shared memory, and later whenever wal write + * permitted, write an XLOG_FPW_CHANGE record before resource manager writes + * cleanup WAL records or checkpoint record is written. + */ + Insert->fullPageWrites = lastFullPageWrites; + /* Prepare to accept WAL writes. */ - promoted = XLogAcceptWrites(EndOfLogTLI, EndOfLog, ThisTimeLineID); + promoted = XLogAcceptWrites(); /* * All done with end-of-recovery actions. @@ -8204,30 +8241,42 @@ StartupXLOG(void) * Prepare to accept WAL writes. */ static bool -XLogAcceptWrites(TimeLineID EndOfLogTLI, XLogRecPtr EndOfLog, - TimeLineID ThisTimeLineID) +XLogAcceptWrites(void) { bool promoted = false; - XLogCtlInsert *Insert = &XLogCtl->Insert; + XLogRecPtr EndOfLog = XLogCtl->replayEndRecPtr; + TimeLineID EndOfLogTLI = XLogCtl->replayEndTLI; + TimeLineID ThisTimeLineID = XLogCtl->ThisTimeLineID; /* Enable WAL writes for this backend only. */ LocalSetXLogInsertAllowed(); /* If necessary, write overwrite-contrecord before doing anything else */ - if (!XLogRecPtrIsInvalid(abortedRecPtr)) + if (!XLogRecPtrIsInvalid(XLogCtl->SharedAbortedRecPtr)) { + /* + * Restore missingContrecPtr, needed to set + * XLP_FIRST_IS_OVERWRITE_CONTRECORD flag on the page header where + * overwrite-contrecord get written. See AdvanceXLInsertBuffer(). + * + * NB: We can safely use lastSegSwitchLSN to restore missingContrecPtr, + * which is never going to change until we reach here since there wasn't + * any wal write before. + */ + GetLastSegSwitchData(&missingContrecPtr); Assert(!XLogRecPtrIsInvalid(missingContrecPtr)); - CreateOverwriteContrecordRecord(abortedRecPtr); - abortedRecPtr = InvalidXLogRecPtr; - missingContrecPtr = InvalidXLogRecPtr; + + /* + * In case of abort record, the actual end of WAL will be the missing + * contrecord since the rest further part will be skipped. + */ + EndOfLog = missingContrecPtr; + + CreateOverwriteContrecordRecord(XLogCtl->SharedAbortedRecPtr); + XLogCtl->SharedAbortedRecPtr = 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; + /* Write an XLOG_FPW_CHANGE record */ UpdateFullPageWrites(); /* @@ -8385,8 +8434,8 @@ PerformRecoveryXLogAction(void) * a full checkpoint. A checkpoint is requested later, after we're fully out * of recovery mode and already accepting queries. */ - if (ArchiveRecoveryRequested && IsUnderPostmaster && - LocalPromoteIsTriggered) + if (XLogCtl->SharedArchiveRecoveryRequested && IsUnderPostmaster && + PromoteIsTriggered()) { promoted = true; -- 2.18.0