From 85d0e661aae656d3ec710dab24f883c4b4ef90da Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Thu, 21 May 2015 13:56:17 +0900 Subject: [PATCH] Make recovery_target_action = pause work. Previously even if recovery_target_action was set to pause and the recovery target was reached, the recovery could never be paused. Because the setting of pause was *always* overridden with that of shutdown unexpectedly. This override is valid and intentional if hot_standby is not enabled because there is no way to resume the paused recovery in this case and the setting of pause is completely useless. But not if hot_standby is enabled. This patch changes the code so that the setting of pause is overridden with that of shutdown only when hot_standby is not enabled. Bug reported by Andres Freund --- src/backend/access/transam/xlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 4af8fdc364..3b44c9dade 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5141,8 +5141,8 @@ readRecoveryCommandFile(void) */ if (recoveryTargetAction == RECOVERY_TARGET_ACTION_PAUSE && recoveryTargetActionSet && - standbyState == STANDBY_DISABLED) - recoveryTargetAction = RECOVERY_TARGET_ACTION_SHUTDOWN; + !EnableHotStandby) + recoveryTargetAction = RECOVERY_TARGET_ACTION_SHUTDOWN; /* Enable fetching from archive recovery area */ ArchiveRecoveryRequested = true; -- GitLab