If multiple recovery_targets are specified, use the latest one.

hlinnaka · hlinnaka · commit 815d71deed5d · 2014-01-08T22:26:39.000+02:00
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.
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -5402,13 +5402,6 @@ readRecoveryCommandFile(void)`
`5402`	`5402`	`}`
`5403`	`5403`	`else if (strcmp(item->name, "recovery_target_time") == 0)`
`5404`	`5404`	`{`
`5405`		`- /*`
`5406`		`- * if recovery_target_xid or recovery_target_name specified, then`
`5407`		`- * this overrides recovery_target_time`
`5408`		`- */`
`5409`		`- if (recoveryTarget == RECOVERY_TARGET_XID \|\|`
`5410`		`- recoveryTarget == RECOVERY_TARGET_NAME)`
`5411`		`- continue;`
`5412`	`5405`	`recoveryTarget = RECOVERY_TARGET_TIME;`
`5413`	`5406`
`5414`	`5407`	`/*`
`@@ -5425,12 +5418,6 @@ readRecoveryCommandFile(void)`
`5425`	`5418`	`}`
`5426`	`5419`	`else if (strcmp(item->name, "recovery_target_name") == 0)`
`5427`	`5420`	`{`
`5428`		`- /*`
`5429`		`- * if recovery_target_xid specified, then this overrides`
`5430`		`- * recovery_target_name`
`5431`		`- */`
`5432`		`- if (recoveryTarget == RECOVERY_TARGET_XID)`
`5433`		`- continue;`
`5434`	`5421`	`recoveryTarget = RECOVERY_TARGET_NAME;`
`5435`	`5422`
`5436`	`5423`	`recoveryTargetName = pstrdup(item->value);`