Commit 6c4f6664 authored by Heikki Linnakangas's avatar Heikki Linnakangas

Fix thinko in previous commit.

We must still initialize minRecoveryPoint if we start straight with archive
recovery, e.g when recovering from a normal base backup taken with
pg_start/stop_backup. Otherwise we never consider the system consistent.
parent 6d060494
...@@ -5265,6 +5265,15 @@ StartupXLOG(void) ...@@ -5265,6 +5265,15 @@ StartupXLOG(void)
ControlFile->prevCheckPoint = ControlFile->checkPoint; ControlFile->prevCheckPoint = ControlFile->checkPoint;
ControlFile->checkPoint = checkPointLoc; ControlFile->checkPoint = checkPointLoc;
ControlFile->checkPointCopy = checkPoint; 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. * Set backupStartPoint if we're starting recovery from a base backup.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment