postgrespro.git / summary / log / commit / refs

commit    7acf8a876b7704ae162fc4f48ff97f4290fb0a61
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Mon Sep 30 01:18:15 2019 +0000

    Make crash recovery ignore recovery target settings.
    
    In v11 or before, recovery target settings could not take effect in
    crash recovery because they are specified in recovery.conf and
    crash recovery always starts without recovery.conf. But commit
    2dedf4d9a8 integrated recovery.conf into postgresql.conf and
    which unexpectedly allowed recovery target settings to take effect
    even in crash recovery. This is definitely not good behavior.
    
    To fix the issue, this commit makes crash recovery always ignore
    recovery target settings.
    
    Back-patch to v12.
    
    Author: Peter Eisentraut
    Reviewed-by: Fujii Masao
    Discussion: https://postgr.es/m/e445616d-023e-a268-8aa1-67b8b335340c@pgmasters.net


 src/backend/access/transam/xlog.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 6c69eb6dd7..61ba6b852e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5618,6 +5618,13 @@ recoveryStopsBefore(XLogReaderState *record)
 	TimestampTz recordXtime = 0;
 	TransactionId recordXid;
 
+	/*
+	 * Ignore recovery target settings when not in archive recovery (meaning
+	 * we are in crash recovery).
+	 */
+	if (!ArchiveRecoveryRequested)
+		return false;
+
 	/* Check if we should stop as soon as reaching consistency */
 	if (recoveryTarget == RECOVERY_TARGET_IMMEDIATE && reachedConsistency)
 	{
@@ -5759,6 +5766,13 @@ recoveryStopsAfter(XLogReaderState *record)
 	uint8		rmid;
 	TimestampTz recordXtime;
 
+	/*
+	 * Ignore recovery target settings when not in archive recovery (meaning
+	 * we are in crash recovery).
+	 */
+	if (!ArchiveRecoveryRequested)
+		return false;
+
 	info = XLogRecGetInfo(record) & ~XLR_INFO_MASK;
 	rmid = XLogRecGetRmid(record);
 


[parent: ac88807f9b22]