From 3739e5ab93afb21b69da2e42f6e161ef63aa95c8 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 8 Jan 2014 23:06:03 +0200 Subject: [PATCH] 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. --- src/backend/access/transam/xlog.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index c299130038..3cde91eaf8 100644 --- 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)));