NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitabe2033

committed

Log the correct ending timestamp in recovery_target_xid mode.

When ending recovery based on recovery_target_xid matching withrecovery_target_inclusive = off, we printed an incorrect timestamp(always 2000-01-01) in the "recovery stopping before ... transaction"log message. This is a consequence of sloppy refactoring inc945af8: the code to fetch recordXtime out of the commit/abortrecord used to be executed unconditionally, but it was changedto get called only in the RECOVERY_TARGET_TIME case. We need onlyflip the order of operations to restore the intended behavior.Per report from Torsten Förtsch. Back-patch to all supportedbranches.Discussion:https://postgr.es/m/CAKkG4_kUevPqbmyOfLajx7opAQk6Cvwkvx0HRcFjSPfRPTXanA@mail.gmail.com

1 parent49e3a5e commitabe2033Copy full SHA for abe2033

File tree

1 file changed

-2

lines changed

src/backend/access/transam
- xlogrecovery.c

1 file changed

-2

lines changed

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

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2544,8 +2544,13 @@ recoveryStopsBefore(XLogReaderState *record)`
`2544`	`2544`	`stopsHere= (recordXid==recoveryTargetXid);`
`2545`	`2545`	`}`
`2546`	`2546`
`2547`		`-if (recoveryTarget==RECOVERY_TARGET_TIME&&`
`2548`		`-getRecordTimestamp(record,&recordXtime))`
	`2547`	`+/*`
	`2548`	`+ * Note: we must fetch recordXtime regardless of recoveryTarget setting.`
	`2549`	`+ * We don't expect getRecordTimestamp ever to fail, since we already know`
	`2550`	`+ * this is a commit or abort record; but test its result anyway.`
	`2551`	`+ */`
	`2552`	`+if (getRecordTimestamp(record,&recordXtime)&&`
	`2553`	`+recoveryTarget==RECOVERY_TARGET_TIME)`
`2549`	`2554`	`{`
`2550`	`2555`	`/*`
`2551`	`2556`	`* There can be many transactions that share the same commit time, so`

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!

Commitabe2033

File tree

1 file changed

1 file changed

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

0 commit comments