diff options
| author | Robert Haas <rhaas@postgresql.org> | 2023-02-06 11:16:03 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2023-02-06 11:16:03 -0500 |
| commit | 1eadfbdd7eb0679ba8d45787aa8b2f06e76de20a (patch) | |
| tree | 09b3b7f148ee800fc21c8559e411e11df62f0af8 /src/backend/access/transam | |
| parent | 98e7234242a652497c99d4d0d6f2bf9a75d4e921 (diff) | |
| download | postgresql-1eadfbdd7eb0679ba8d45787aa8b2f06e76de20a.tar.gz postgresql-1eadfbdd7eb0679ba8d45787aa8b2f06e76de20a.zip | |
Revert "Disable STARTUP_PROGRESS_TIMEOUT in standby mode."
This reverts commit 98e7234242a652497c99d4d0d6f2bf9a75d4e921. I
forgot that we're about to wrap a release, and this fix isn't
critical enough to justify committing it right before we wrap
a release.
Discussion: http://postgr.es/m/2676424.1675700113@sss.pgh.pa.us
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/xlogrecovery.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index a0e984aae04..958e85366c1 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -383,7 +383,6 @@ static bool recoveryStopAfter; /* prototypes for local functions */ static void ApplyWalRecord(XLogReaderState *xlogreader, XLogRecord *record, TimeLineID *replayTLI); -static void EnableStandbyMode(void); static void readRecoverySignalFile(void); static void validateRecoveryParameters(void); static bool read_backup_label(XLogRecPtr *checkPointLoc, @@ -469,24 +468,6 @@ XLogRecoveryShmemInit(void) } /* - * A thin wrapper to enable StandbyMode and do other preparatory work as - * needed. - */ -static void -EnableStandbyMode(void) -{ - StandbyMode = true; - - /* - * To avoid server log bloat, we don't report recovery progress in a - * standby as it will always be in recovery unless promoted. We disable - * startup progress timeout in standby mode to avoid calling - * startup_progress_timeout_handler() unnecessarily. - */ - disable_startup_progress_timeout(); -} - -/* * Prepare the system for WAL recovery, if needed. * * This is called by StartupXLOG() which coordinates the server startup @@ -619,7 +600,7 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr, */ InArchiveRecovery = true; if (StandbyModeRequested) - EnableStandbyMode(); + StandbyMode = true; /* * When a backup_label file is present, we want to roll forward from @@ -756,7 +737,7 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr, { InArchiveRecovery = true; if (StandbyModeRequested) - EnableStandbyMode(); + StandbyMode = true; } /* Get the last valid checkpoint record. */ @@ -3134,7 +3115,7 @@ ReadRecord(XLogPrefetcher *xlogprefetcher, int emode, (errmsg_internal("reached end of WAL in pg_wal, entering archive recovery"))); InArchiveRecovery = true; if (StandbyModeRequested) - EnableStandbyMode(); + StandbyMode = true; SwitchIntoArchiveRecovery(xlogreader->EndRecPtr, replayTLI); minRecoveryPoint = xlogreader->EndRecPtr; |