diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml index b4959ac..519a0ce 100644 --- a/doc/src/sgml/recovery-config.sgml +++ b/doc/src/sgml/recovery-config.sgml @@ -280,31 +280,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows - - pause_at_recovery_target (boolean) + + recovery_target_action (enum) - pause_at_recovery_target recovery parameter - - - - - Alias for action_at_recovery_target, true is same as - action_at_recovery_target = pause and false - is same as action_at_recovery_target = promote. - - - This setting has no effect if is not - enabled, or if no recovery target is set. - - - - - - action_at_recovery_target (enum) - - action_at_recovery_target recovery parameter + recovery_target_action recovery parameter @@ -336,7 +316,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows Note that because recovery.conf will not be renamed when - action_at_recovery_target is set to shutdown, + recovery_target_action is set to shutdown, any subsequent start will end with immediate shutdown unless the configuration is changed or the recovery.conf is removed manually. diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 0f09add..e4193f4 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4653,10 +4653,8 @@ readRecoveryCommandFile(void) ConfigVariable *item, *head = NULL, *tail = NULL; - bool recoveryPauseAtTargetSet = false; bool recoveryTargetActionSet = false; - fd = AllocateFile(RECOVERY_COMMAND_FILE, "r"); if (fd == NULL) { @@ -4699,25 +4697,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) @@ -4903,18 +4882,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.