mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bogus log message when starting from a cleanly shut down state.

Browse Source 
In commit 70e81861fa to split xlog.c, I moved the startup code that
updates the state in the control file and prints out the "database
system was not properly shut down" message to the log, but I
accidentally removed the "if (InRecovery)" check around it. As a
result, that message was printed even if the system was cleanly shut
down, also during 'initdb'.

Discussion: https://www.postgresql.org/message-id/3357075.1645031062@sss.pgh.pa.us
This commit is contained in:
Heikki Linnakangas 2022-02-16 23:15:08 +02:00
parent 01ad1c9530
commit 4620892344
1 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/backend/access/transam/xlogrecovery.c
View File

@ -840,69 +840,75 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr,
} }
/* /*
* Update pg_control to show that we are recovering and to show the * If recovery is needed, update our in-memory copy of pg_control to show
* selected checkpoint as the place we are starting from. We also mark * that we are recovering and to show the selected checkpoint as the place
* pg_control with any minimum recovery stop point obtained from a backup * we are starting from. We also mark pg_control with any minimum recovery
* history file. * stop point obtained from a backup history file.
*
* We don't write the changes to disk yet, though. Only do that after
* initializing various subsystems.
*/ */
if (InArchiveRecovery) if (InRecovery)
{ {
ControlFile->state = DB_IN_ARCHIVE_RECOVERY; if (InArchiveRecovery)
}
else
{
ereport(LOG,
(errmsg("database system was not properly shut down; "
"automatic recovery in progress")));
if (recoveryTargetTLI > ControlFile->checkPointCopy.ThisTimeLineID)
ereport(LOG,
(errmsg("crash recovery starts in timeline %u "
"and has target timeline %u",
ControlFile->checkPointCopy.ThisTimeLineID,
recoveryTargetTLI)));
ControlFile->state = DB_IN_CRASH_RECOVERY;
}
ControlFile->checkPoint = CheckPointLoc;
ControlFile->checkPointCopy = checkPoint;
if (InArchiveRecovery)
{
/* initialize minRecoveryPoint if not set yet */
if (ControlFile->minRecoveryPoint < checkPoint.redo)
{ {
ControlFile->minRecoveryPoint = checkPoint.redo; ControlFile->state = DB_IN_ARCHIVE_RECOVERY;
ControlFile->minRecoveryPointTLI = checkPoint.ThisTimeLineID;
} }
} else
/*
* Set backupStartPoint if we're starting recovery from a base backup.
*
* Also set backupEndPoint and use minRecoveryPoint as the backup end
* location if we're starting recovery from a base backup which was taken
* from a standby. In this case, the database system status in pg_control
* must indicate that the database was already in recovery. Usually that
* will be DB_IN_ARCHIVE_RECOVERY but also can be
* DB_SHUTDOWNED_IN_RECOVERY if recovery previously was interrupted before
* reaching this point; e.g. because restore_command or primary_conninfo
* were faulty.
*
* Any other state indicates that the backup somehow became corrupted and
* we can't sensibly continue with recovery.
*/
if (haveBackupLabel)
{
ControlFile->backupStartPoint = checkPoint.redo;
ControlFile->backupEndRequired = backupEndRequired;
if (backupFromStandby)
{ {
if (dbstate_at_startup != DB_IN_ARCHIVE_RECOVERY && ereport(LOG,
dbstate_at_startup != DB_SHUTDOWNED_IN_RECOVERY) (errmsg("database system was not properly shut down; "
ereport(FATAL, "automatic recovery in progress")));
(errmsg("backup_label contains data inconsistent with control file"), if (recoveryTargetTLI > ControlFile->checkPointCopy.ThisTimeLineID)
errhint("This means that the backup is corrupted and you will " ereport(LOG,
"have to use another backup for recovery."))); (errmsg("crash recovery starts in timeline %u "
ControlFile->backupEndPoint = ControlFile->minRecoveryPoint; "and has target timeline %u",
ControlFile->checkPointCopy.ThisTimeLineID,
recoveryTargetTLI)));
ControlFile->state = DB_IN_CRASH_RECOVERY;
}
ControlFile->checkPoint = CheckPointLoc;
ControlFile->checkPointCopy = checkPoint;
if (InArchiveRecovery)
{
/* initialize minRecoveryPoint if not set yet */
if (ControlFile->minRecoveryPoint < checkPoint.redo)
{
ControlFile->minRecoveryPoint = checkPoint.redo;
ControlFile->minRecoveryPointTLI = checkPoint.ThisTimeLineID;
}
}
/*
* Set backupStartPoint if we're starting recovery from a base backup.
*
* Also set backupEndPoint and use minRecoveryPoint as the backup end
* location if we're starting recovery from a base backup which was
* taken from a standby. In this case, the database system status in
* pg_control must indicate that the database was already in recovery.
* Usually that will be DB_IN_ARCHIVE_RECOVERY but also can be
* DB_SHUTDOWNED_IN_RECOVERY if recovery previously was interrupted
* before reaching this point; e.g. because restore_command or
* primary_conninfo were faulty.
*
* Any other state indicates that the backup somehow became corrupted
* and we can't sensibly continue with recovery.
*/
if (haveBackupLabel)
{
ControlFile->backupStartPoint = checkPoint.redo;
ControlFile->backupEndRequired = backupEndRequired;
if (backupFromStandby)
{
if (dbstate_at_startup != DB_IN_ARCHIVE_RECOVERY &&
dbstate_at_startup != DB_SHUTDOWNED_IN_RECOVERY)
ereport(FATAL,
(errmsg("backup_label contains data inconsistent with control file"),
errhint("This means that the backup is corrupted and you will "
"have to use another backup for recovery.")));
ControlFile->backupEndPoint = ControlFile->minRecoveryPoint;
}
} }
} }