Fix pause_at_recovery_target + recovery_target_inclusive combination.

If pause_at_recovery_target is set, recovery pauses *before* applying the
target record, even if recovery_target_inclusive is set. If you then
continue with pg_xlog_replay_resume(), it will apply the target record
before ending recovery. In other words, if you log in while it's paused
and verify that the database looks OK, ending recovery changes its state
again, possibly destroying data that you were tring to salvage with PITR.

Backpatch to 9.1, this has been broken since pause_at_recovery_target was
added.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index c29913003809dc14772ca0f761956fb5287aef64..3cde91eaf8af49fcfb75dd8a51efb418a5db4cc8 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6794,11 +6794,6 @@ StartupXLOG(void)
                                 */
                                if (recoveryStopsHere(record, &recoveryApply, &recoveryDelay))
                                {
-                                       if (recoveryPauseAtTarget)
-                                       {
-                                               SetRecoveryPause(true);
-                                               recoveryPausesHere();
-                                       }
                                        reachedStopPoint = true;        /* see below */
                                        recoveryContinue = false;
 
@@ -6948,6 +6943,12 @@ StartupXLOG(void)
                         * end of main redo apply loop
                         */
 
+                       if (recoveryPauseAtTarget && reachedStopPoint)
+                       {
+                               SetRecoveryPause(true);
+                               recoveryPausesHere();
+                       }
+
                        ereport(LOG,
                                        (errmsg("redo done at %X/%X",
                                                 (uint32) (ReadRecPtr >> 32), (uint32) ReadRecPtr)));