From 815d71deed5df2a91b06da76edbe5bc64965bfea Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 8 Jan 2014 22:26:39 +0200 Subject: [PATCH] If multiple recovery_targets are specified, use the latest one. The docs say that only one of recovery_target_xid, recovery_target_time, or recovery_target_name can be specified. But the code actually did something different, so that a name overrode time, and xid overrode both time and name. Now the target specified last takes effect, whether it's an xid, time or name. With this patch, we still accept multiple recovery_target settings, even though docs say that only one can be specified. It's a general property of the recovery.conf file parser that you if you specify the same option twice, the last one takes effect, like with postgresql.conf. --- src/backend/access/transam/xlog.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index f7746080a6..c299130038 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5402,13 +5402,6 @@ readRecoveryCommandFile(void) } else if (strcmp(item->name, "recovery_target_time") == 0) { - /* - * if recovery_target_xid or recovery_target_name specified, then - * this overrides recovery_target_time - */ - if (recoveryTarget == RECOVERY_TARGET_XID || - recoveryTarget == RECOVERY_TARGET_NAME) - continue; recoveryTarget = RECOVERY_TARGET_TIME; /* @@ -5425,12 +5418,6 @@ readRecoveryCommandFile(void) } else if (strcmp(item->name, "recovery_target_name") == 0) { - /* - * if recovery_target_xid specified, then this overrides - * recovery_target_name - */ - if (recoveryTarget == RECOVERY_TARGET_XID) - continue; recoveryTarget = RECOVERY_TARGET_NAME; recoveryTargetName = pstrdup(item->value); -- 2.40.0