From a5363a696a46d97b94ac63394f3952e9769ee113 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 5 Mar 2014 14:41:55 +0200 Subject: [PATCH] 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 a36354feb9..559ec58f86 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4815,7 +4815,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"), @@ -4826,7 +4826,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, -- 2.40.0