Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit956685f

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

File tree

1 file changed

+2
-2
lines changed
  • src/backend/access/transam

1 file changed

+2
-2
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6187,7 +6187,7 @@ CheckRequiredParameterValues(void)
61876187
* For archive recovery, the WAL must be generated with at least 'archive'
61886188
* wal_level.
61896189
*/
6190-
if (InArchiveRecovery&&ControlFile->wal_level==WAL_LEVEL_MINIMAL)
6190+
if (ArchiveRecoveryRequested&&ControlFile->wal_level==WAL_LEVEL_MINIMAL)
61916191
{
61926192
ereport(WARNING,
61936193
(errmsg("WAL was generated with wal_level=minimal, data may be missing"),
@@ -6198,7 +6198,7 @@ CheckRequiredParameterValues(void)
61986198
* For Hot Standby, the WAL must be generated with 'hot_standby' mode, and
61996199
* we must have at least as many backend slots as the primary.
62006200
*/
6201-
if (InArchiveRecovery&&EnableHotStandby)
6201+
if (ArchiveRecoveryRequested&&EnableHotStandby)
62026202
{
62036203
if (ControlFile->wal_level<WAL_LEVEL_HOT_STANDBY)
62046204
ereport(ERROR,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp