rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 00:11:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Further simplify a bit of logic in StartupXLOG().

Browse Source 
Commit 7ff23c6d27 left us with two
identical cases. Collapse them.

Author: Robert Haas <robertmhaas@gmail.com>
Discussion: https://postgr.es/m/CA%2BhUKGJ8NRsqgkZEnsnRc2MFROBV-jCnacbYvtpptK2A9YYp9Q%40mail.gmail.com
This commit is contained in:
Thomas Munro 2021-08-03 14:11:55 +12:00
parent db632fbca3
commit 8f7c8e2bef
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/access/transam/xlog.c
View File

@ -7890,28 +7890,22 @@ StartupXLOG(void)
* after we're fully out of recovery mode and already accepting
* queries.
*/
if (ArchiveRecoveryRequested && IsUnderPostmaster)
if (ArchiveRecoveryRequested && IsUnderPostmaster &&
LocalPromoteIsTriggered)
{
if (LocalPromoteIsTriggered)
{
promoted = true;
promoted = true;
/*
* Insert a special WAL record to mark the end of recovery,
* since we aren't doing a checkpoint. That means that the
* checkpointer process may likely be in the middle of a
* time-smoothed restartpoint and could continue to be for
* minutes after this. That sounds strange, but the effect is
* roughly the same and it would be stranger to try to come
* out of the restartpoint and then checkpoint. We request a
* checkpoint later anyway, just for safety.
*/
CreateEndOfRecoveryRecord();
}
else
RequestCheckpoint(CHECKPOINT_END_OF_RECOVERY |
CHECKPOINT_IMMEDIATE |
CHECKPOINT_WAIT);
/*
* Insert a special WAL record to mark the end of recovery, since
* we aren't doing a checkpoint. That means that the checkpointer
* process may likely be in the middle of a time-smoothed
* restartpoint and could continue to be for minutes after this.
* That sounds strange, but the effect is roughly the same and it
* would be stranger to try to come out of the restartpoint and
* then checkpoint. We request a checkpoint later anyway, just for
* safety.
*/
CreateEndOfRecoveryRecord();
}
else
{