postgres.git / summary / log / commit / refs

commit    e7ec05562ed754fb60f75ea83efe103266a92015
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Wed Mar 05 12:41:55 2014 +0000
First released in: 9.4.0, 9.2.8, 9.3.4

    Do wal_level and hot standby checks when doing crash-then-archive recovery.
    
    CheckRequiredParameterValues() should perform the checks if archive recovery
    was requested, even if we are going to perform crash recovery first.
    
    Reported by Kyotaro HORIGUCHI. Backpatch to 9.2, like the crash-then-archive
    recovery mode.


 src/backend/access/transam/xlog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 9f34f1ec7cf..15e0c01b59d 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6195,7 +6195,7 @@ CheckRequiredParameterValues(void)
 	 * For archive recovery, the WAL must be generated with at least 'archive'
 	 * wal_level.
 	 */
-	if (InArchiveRecovery && ControlFile->wal_level == WAL_LEVEL_MINIMAL)
+	if (ArchiveRecoveryRequested && ControlFile->wal_level == WAL_LEVEL_MINIMAL)
 	{
 		ereport(WARNING,
 				(errmsg("WAL was generated with wal_level=minimal, data may be missing"),
@@ -6206,7 +6206,7 @@ CheckRequiredParameterValues(void)
 	 * For Hot Standby, the WAL must be generated with 'hot_standby' mode, and
 	 * we must have at least as many backend slots as the primary.
 	 */
-	if (InArchiveRecovery && EnableHotStandby)
+	if (ArchiveRecoveryRequested && EnableHotStandby)
 	{
 		if (ControlFile->wal_level < WAL_LEVEL_HOT_STANDBY)
 			ereport(ERROR,


[parent: 931dc26b0d2b]