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 720f18116e9517d6265dd1dcb041d74808f6d8ea..33778e569957a37d8e912277cd66f682d061746c 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6623,11 +6623,6 @@ StartupXLOG(void)
                                 */
                                if (recoveryStopsHere(record, &recoveryApply))
                                {
-                                       if (recoveryPauseAtTarget)
-                                       {
-                                               SetRecoveryPause(true);
-                                               recoveryPausesHere();
-                                       }
                                        reachedStopPoint = true;        /* see below */
                                        recoveryContinue = false;
 
@@ -6697,6 +6692,12 @@ StartupXLOG(void)
                         * end of main redo apply loop
                         */
 
+                       if (recoveryPauseAtTarget && reachedStopPoint)
+                       {
+                               SetRecoveryPause(true);
+                               recoveryPausesHere();
+                       }
+
                        ereport(LOG,
                                        (errmsg("redo done at %X/%X",
                                                        ReadRecPtr.xlogid, ReadRecPtr.xrecoff)));