NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit815d71d

committed

If multiple recovery_targets are specified, use the latest one.

The docs say that only one of recovery_target_xid, recovery_target_time, orrecovery_target_name can be specified. But the code actually did somethingdifferent, 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 orname.With this patch, we still accept multiple recovery_target settings, eventhough docs say that only one can be specified. It's a general property ofthe recovery.conf file parser that you if you specify the same option twice,the last one takes effect, like with postgresql.conf.

1 parent847e46a commit815d71dCopy full SHA for 815d71d

File tree

1 file changed

-13

lines changed

src/backend/access/transam
- xlog.c

1 file changed

-13

lines changed

`‎src/backend/access/transam/xlog.c`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -5402,13 +5402,6 @@ readRecoveryCommandFile(void)`
`5402`	`5402`	`}`
`5403`	`5403`	`elseif (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`	`elseif (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);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit815d71d

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/xlog.c`

0 commit comments