Fix lastReplayedEndRecPtr calculation when starting from shutdown checkpoint.

When entering crash recovery followed by archive recovery, and the latest
checkpoint is a shutdown checkpoint, and there are no more WAL records to
replay before transitioning from crash to archive recovery, we would not
immediately allow read-only connections in hot standby mode even if we
could. That's because when starting from a shutdown checkpoint, we set
lastReplayedEndRecPtr incorrectly to the record before the checkpoint
record, instead of the checkpoint record itself. We don't run the redo
routine of the shutdown checkpoint record, but starting recovery from it
goes through the same motions, so it should be considered as replayed.

Reported by Kyotaro HORIGUCHI. All versions with hot standby are affected,
so backpatch to 9.0.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 53a20b1e60600016e3225b2be23ade41525ece7b..e3d5e106b9196a366c21b1e218b3681e6c85a7bb 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6846,13 +6846,17 @@ StartupXLOG(void)
 
                /*
                 * Initialize shared variables for tracking progress of WAL replay,
-                * as if we had just replayed the record before the REDO location.
+                * as if we had just replayed the record before the REDO location
+                * (or the checkpoint record itself, if it's a shutdown checkpoint).
                 */
                SpinLockAcquire(&xlogctl->info_lck);
-               xlogctl->replayEndRecPtr = checkPoint.redo;
+               if (checkPoint.redo < RecPtr)
+                       xlogctl->replayEndRecPtr = checkPoint.redo;
+               else
+                       xlogctl->replayEndRecPtr = EndRecPtr;
                xlogctl->replayEndTLI = ThisTimeLineID;
-               xlogctl->lastReplayedEndRecPtr = checkPoint.redo;
-               xlogctl->lastReplayedTLI = ThisTimeLineID;
+               xlogctl->lastReplayedEndRecPtr = xlogctl->replayEndRecPtr;
+               xlogctl->lastReplayedTLI = xlogctl->replayEndTLI;
                xlogctl->recoveryLastXTime = 0;
                xlogctl->currentChunkStartTime = 0;
                xlogctl->recoveryPause = false;