Rely only on checkpoint 1 at end of recovery.

simonat2ndQuadrant · simonat2ndQuadrant · commit 072521b8c804 · 2013-02-07T16:33:05.000Z
Searching for checkpoint 2 (previous) is not
correct in all cases.

Bug report from Heikki Linnakangas
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -5777,7 +5777,13 @@ StartupXLOG(void)
 			if (fast_promote)
 			{
 				checkPointLoc = ControlFile->prevCheckPoint;
-				record = ReadCheckpointRecord(xlogreader, checkPointLoc, 2, false);
+
+				/*
+				 * Confirm the last checkpoint is available for us to recover
+				 * from if we fail. Note that we don't check for the secondary
+				 * checkpoint since that isn't available in most base backups.
+				 */
+				record = ReadCheckpointRecord(xlogreader, checkPointLoc, 1, false);
 				if (record != NULL)
 				{
 					checkpoint_wait = false;
