From 5e41e2eebba9314346fb25d871a891f1521f17f7 Mon Sep 17 00:00:00 2001 From: alterego655 <824662526@qq.com> Date: Mon, 26 Jan 2026 16:44:57 +0800 Subject: [PATCH v1 1/4] Refactor: move XLogRecoveryCtlData struct to xlogrecovery.h Move the XLogRecoveryCtlData struct definition from xlogrecovery.c to xlogrecovery.h, and export the XLogRecoveryCtl pointer. This allows other modules to access recovery state directly, which will be used by a subsequent commit to add a pg_stat_recovery view. No functional change. --- src/backend/access/transam/xlogrecovery.c | 66 +--------------------- src/include/access/xlogrecovery.h | 68 +++++++++++++++++++++++ 2 files changed, 69 insertions(+), 65 deletions(-) diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index 117d8d8bb6b..b9393e551b7 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -304,71 +304,7 @@ bool reachedConsistency = false; static char *replay_image_masked = NULL; static char *primary_image_masked = NULL; - -/* - * Shared-memory state for WAL recovery. - */ -typedef struct XLogRecoveryCtlData -{ - /* - * SharedHotStandbyActive indicates if we allow hot standby queries to be - * run. Protected by info_lck. - */ - bool SharedHotStandbyActive; - - /* - * SharedPromoteIsTriggered indicates if a standby promotion has been - * triggered. Protected by info_lck. - */ - bool SharedPromoteIsTriggered; - - /* - * recoveryWakeupLatch is used to wake up the startup process to continue - * WAL replay, if it is waiting for WAL to arrive or promotion to be - * requested. - * - * Note that the startup process also uses another latch, its procLatch, - * to wait for recovery conflict. If we get rid of recoveryWakeupLatch for - * signaling the startup process in favor of using its procLatch, which - * comports better with possible generic signal handlers using that latch. - * But we should not do that because the startup process doesn't assume - * that it's waken up by walreceiver process or SIGHUP signal handler - * while it's waiting for recovery conflict. The separate latches, - * recoveryWakeupLatch and procLatch, should be used for inter-process - * communication for WAL replay and recovery conflict, respectively. - */ - Latch recoveryWakeupLatch; - - /* - * Last record successfully replayed. - */ - XLogRecPtr lastReplayedReadRecPtr; /* start position */ - XLogRecPtr lastReplayedEndRecPtr; /* end+1 position */ - TimeLineID lastReplayedTLI; /* timeline */ - - /* - * When we're currently replaying a record, ie. in a redo function, - * replayEndRecPtr points to the end+1 of the record being replayed, - * otherwise it's equal to lastReplayedEndRecPtr. - */ - XLogRecPtr replayEndRecPtr; - TimeLineID replayEndTLI; - /* timestamp of last COMMIT/ABORT record replayed (or being replayed) */ - TimestampTz recoveryLastXTime; - - /* - * timestamp of when we started replaying the current chunk of WAL data, - * only relevant for replication or archive recovery - */ - TimestampTz currentChunkStartTime; - /* Recovery pause state */ - RecoveryPauseState recoveryPauseState; - ConditionVariable recoveryNotPausedCV; - - slock_t info_lck; /* locks shared variables shown above */ -} XLogRecoveryCtlData; - -static XLogRecoveryCtlData *XLogRecoveryCtl = NULL; +XLogRecoveryCtlData *XLogRecoveryCtl = NULL; /* * abortedRecPtr is the start pointer of a broken record at end of WAL when diff --git a/src/include/access/xlogrecovery.h b/src/include/access/xlogrecovery.h index f926d89cb2f..3d1ee491f39 100644 --- a/src/include/access/xlogrecovery.h +++ b/src/include/access/xlogrecovery.h @@ -14,6 +14,9 @@ #include "access/xlogreader.h" #include "catalog/pg_control.h" #include "lib/stringinfo.h" +#include "storage/condition_variable.h" +#include "storage/latch.h" +#include "storage/spin.h" #include "utils/timestamp.h" /* @@ -58,6 +61,71 @@ typedef enum RecoveryPauseState RECOVERY_PAUSED, /* recovery is paused */ } RecoveryPauseState; +/* + * Shared-memory state for WAL recovery. + */ +typedef struct XLogRecoveryCtlData +{ + /* + * SharedHotStandbyActive indicates if we allow hot standby queries to be + * run. Protected by info_lck. + */ + bool SharedHotStandbyActive; + + /* + * SharedPromoteIsTriggered indicates if a standby promotion has been + * triggered. Protected by info_lck. + */ + bool SharedPromoteIsTriggered; + + /* + * recoveryWakeupLatch is used to wake up the startup process to continue + * WAL replay, if it is waiting for WAL to arrive or promotion to be + * requested. + * + * Note that the startup process also uses another latch, its procLatch, + * to wait for recovery conflict. If we get rid of recoveryWakeupLatch for + * signaling the startup process in favor of using its procLatch, which + * comports better with possible generic signal handlers using that latch. + * But we should not do that because the startup process doesn't assume + * that it's waken up by walreceiver process or SIGHUP signal handler + * while it's waiting for recovery conflict. The separate latches, + * recoveryWakeupLatch and procLatch, should be used for inter-process + * communication for WAL replay and recovery conflict, respectively. + */ + Latch recoveryWakeupLatch; + + /* + * Last record successfully replayed. + */ + XLogRecPtr lastReplayedReadRecPtr; /* start position */ + XLogRecPtr lastReplayedEndRecPtr; /* end+1 position */ + TimeLineID lastReplayedTLI; /* timeline */ + + /* + * When we're currently replaying a record, ie. in a redo function, + * replayEndRecPtr points to the end+1 of the record being replayed, + * otherwise it's equal to lastReplayedEndRecPtr. + */ + XLogRecPtr replayEndRecPtr; + TimeLineID replayEndTLI; + /* timestamp of last COMMIT/ABORT record replayed (or being replayed) */ + TimestampTz recoveryLastXTime; + + /* + * timestamp of when we started replaying the current chunk of WAL data, + * only relevant for replication or archive recovery + */ + TimestampTz currentChunkStartTime; + /* Recovery pause state */ + RecoveryPauseState recoveryPauseState; + ConditionVariable recoveryNotPausedCV; + + slock_t info_lck; /* locks shared variables shown above */ +} XLogRecoveryCtlData; + +extern PGDLLIMPORT XLogRecoveryCtlData *XLogRecoveryCtl; + /* User-settable GUC parameters */ extern PGDLLIMPORT bool recoveryTargetInclusive; extern PGDLLIMPORT int recoveryTargetAction; -- 2.51.0