mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-17 19:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove pause_at_recovery_target recovery.conf setting.

Browse Source 
The new recovery_target_action (introduced in aedccb1f6/b8e33a85d4)
replaces it's functionality. Having both seems likely to cause more
confusion than it saves worry due to the incompatibility.

Discussion: 5484FC53.2060903@2ndquadrant.com
Author: Petr Jelinek
This commit is contained in:
Andres Freund 2015-03-15 17:37:07 +01:00
parent cd6c45cbee
commit 51c11a7025
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/sgml/release-9.1.sgml
View File

@ -7111,8 +7111,8 @@
<listitem> <listitem>
<para> <para>
Add <filename>recovery.conf</> setting <link Add <filename>recovery.conf</> setting
linkend="pause-at-recovery-target"><varname>pause_at_recovery_target</></link> <varname>pause_at_recovery_target</>
to pause recovery at target (Simon Riggs) to pause recovery at target (Simon Riggs)
</para> </para>

32
src/backend/access/transam/xlog.c
View File

@ -4773,7 +4773,6 @@ readRecoveryCommandFile(void)
ConfigVariable *item, ConfigVariable *item,
*head = NULL, *head = NULL,
*tail = NULL; *tail = NULL;
bool recoveryPauseAtTargetSet = false;
bool recoveryTargetActionSet = false; bool recoveryTargetActionSet = false;
@ -4819,25 +4818,6 @@ readRecoveryCommandFile(void)
(errmsg_internal("archive_cleanup_command = '%s'", (errmsg_internal("archive_cleanup_command = '%s'",
archiveCleanupCommand))); archiveCleanupCommand)));
} }
else if (strcmp(item->name, "pause_at_recovery_target") == 0)
{
bool recoveryPauseAtTarget;
if (!parse_bool(item->value, &recoveryPauseAtTarget))
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("parameter \"%s\" requires a Boolean value", "pause_at_recovery_target")));
ereport(DEBUG2,
(errmsg_internal("pause_at_recovery_target = '%s'",
item->value)));
recoveryTargetAction = recoveryPauseAtTarget ?
RECOVERY_TARGET_ACTION_PAUSE :
RECOVERY_TARGET_ACTION_PROMOTE;
recoveryPauseAtTargetSet = true;
}
else if (strcmp(item->name, "recovery_target_action") == 0) else if (strcmp(item->name, "recovery_target_action") == 0)
{ {
if (strcmp(item->value, "pause") == 0) if (strcmp(item->value, "pause") == 0)
@ -5022,18 +5002,6 @@ readRecoveryCommandFile(void)
RECOVERY_COMMAND_FILE))); RECOVERY_COMMAND_FILE)));
} }
/*
* Check for mutually exclusive parameters
*/
if (recoveryPauseAtTargetSet && recoveryTargetActionSet)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot set both \"%s\" and \"%s\" recovery parameters",
"pause_at_recovery_target",
"recovery_target_action"),
errhint("The \"pause_at_recovery_target\" is deprecated.")));
/* /*
* Override any inconsistent requests. Not that this is a change * Override any inconsistent requests. Not that this is a change
* of behaviour in 9.5; prior to this we simply ignored a request * of behaviour in 9.5; prior to this we simply ignored a request