aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2015-03-15 17:37:07 +0100
committerAndres Freund <andres@anarazel.de>2015-03-15 17:37:07 +0100
commit51c11a7025ecc10c2b922d60a056ad7c6cf147a5 (patch)
treebb905e7a64002fd777487b4ef3e195b2d1d82d1b
parentcd6c45cbeec5e21b470e9a8d19e02f60f1a52807 (diff)
downloadpostgresql-51c11a7025ecc10c2b922d60a056ad7c6cf147a5.tar.gz
postgresql-51c11a7025ecc10c2b922d60a056ad7c6cf147a5.zip
Remove pause_at_recovery_target recovery.conf setting.
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
-rw-r--r--doc/src/sgml/release-9.1.sgml4
-rw-r--r--src/backend/access/transam/xlog.c32
2 files changed, 2 insertions, 34 deletions
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index eed8a365a1b..f5849ff8fae 100644
--- a/doc/src/sgml/release-9.1.sgml
+++ b/doc/src/sgml/release-9.1.sgml
@@ -7111,8 +7111,8 @@
<listitem>
<para>
- Add <filename>recovery.conf</> setting <link
- linkend="pause-at-recovery-target"><varname>pause_at_recovery_target</></link>
+ Add <filename>recovery.conf</> setting
+ <varname>pause_at_recovery_target</>
to pause recovery at target (Simon Riggs)
</para>
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 554491b9a4b..17bd5d85a95 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4773,7 +4773,6 @@ readRecoveryCommandFile(void)
ConfigVariable *item,
*head = NULL,
*tail = NULL;
- bool recoveryPauseAtTargetSet = false;
bool recoveryTargetActionSet = false;
@@ -4819,25 +4818,6 @@ readRecoveryCommandFile(void)
(errmsg_internal("archive_cleanup_command = '%s'",
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)
{
if (strcmp(item->value, "pause") == 0)
@@ -5023,18 +5003,6 @@ readRecoveryCommandFile(void)
}
/*
- * 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
* of behaviour in 9.5; prior to this we simply ignored a request
* to pause if hot_standby = off, which was surprising behaviour.