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

Commit51c11a7

Browse files
committed
Remove pause_at_recovery_target recovery.conf setting.
The new recovery_target_action (introduced inaedccb1/b8e33a85d4)replaces it's functionality. Having both seems likely to cause moreconfusion than it saves worry due to the incompatibility.Discussion: 5484FC53.2060903@2ndquadrant.comAuthor: Petr Jelinek
1 parentcd6c45c commit51c11a7

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

‎doc/src/sgml/release-9.1.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7111,8 +7111,8 @@
71117111

71127112
<listitem>
71137113
<para>
7114-
Add <filename>recovery.conf</> setting <link
7115-
linkend="pause-at-recovery-target"><varname>pause_at_recovery_target</></link>
7114+
Add <filename>recovery.conf</> setting
7115+
<varname>pause_at_recovery_target</>
71167116
to pause recovery at target (Simon Riggs)
71177117
</para>
71187118

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4773,7 +4773,6 @@ readRecoveryCommandFile(void)
47734773
ConfigVariable*item,
47744774
*head=NULL,
47754775
*tail=NULL;
4776-
boolrecoveryPauseAtTargetSet= false;
47774776
boolrecoveryTargetActionSet= false;
47784777

47794778

@@ -4819,25 +4818,6 @@ readRecoveryCommandFile(void)
48194818
(errmsg_internal("archive_cleanup_command = '%s'",
48204819
archiveCleanupCommand)));
48214820
}
4822-
elseif (strcmp(item->name,"pause_at_recovery_target")==0)
4823-
{
4824-
boolrecoveryPauseAtTarget;
4825-
4826-
if (!parse_bool(item->value,&recoveryPauseAtTarget))
4827-
ereport(ERROR,
4828-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
4829-
errmsg("parameter \"%s\" requires a Boolean value","pause_at_recovery_target")));
4830-
4831-
ereport(DEBUG2,
4832-
(errmsg_internal("pause_at_recovery_target = '%s'",
4833-
item->value)));
4834-
4835-
recoveryTargetAction=recoveryPauseAtTarget ?
4836-
RECOVERY_TARGET_ACTION_PAUSE :
4837-
RECOVERY_TARGET_ACTION_PROMOTE;
4838-
4839-
recoveryPauseAtTargetSet= true;
4840-
}
48414821
elseif (strcmp(item->name,"recovery_target_action")==0)
48424822
{
48434823
if (strcmp(item->value,"pause")==0)
@@ -5022,18 +5002,6 @@ readRecoveryCommandFile(void)
50225002
RECOVERY_COMMAND_FILE)));
50235003
}
50245004

5025-
/*
5026-
* Check for mutually exclusive parameters
5027-
*/
5028-
if (recoveryPauseAtTargetSet&&recoveryTargetActionSet)
5029-
ereport(ERROR,
5030-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5031-
errmsg("cannot set both \"%s\" and \"%s\" recovery parameters",
5032-
"pause_at_recovery_target",
5033-
"recovery_target_action"),
5034-
errhint("The \"pause_at_recovery_target\" is deprecated.")));
5035-
5036-
50375005
/*
50385006
* Override any inconsistent requests. Not that this is a change
50395007
* of behaviour in 9.5; prior to this we simply ignored a request

0 commit comments

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