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

diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index eed8a365a1b4ecfd0098c0ed32c29ef55c91555e..f5849ff8faed153544e85616ab8d2be5661d0197 100644 (file)
--- 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 554491b9a4b28f08072065460e9478a85836f80d..17bd5d85a9562df444abc05ec86c8dfcbf605d8d 100644 (file)
--- 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)
@@ -5022,18 +5002,6 @@ readRecoveryCommandFile(void)
                                                        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
         * of behaviour in 9.5; prior to this we simply ignored a request