diff options
| author | Tom Lane | 2023-01-19 17:23:20 +0000 |
|---|---|---|
| committer | Tom Lane | 2023-01-19 17:23:20 +0000 |
| commit | 44e9e34266efd42901bf7b12552f2033972d70b7 (patch) | |
| tree | 30e83cda43e143378d072e57519c9ef1766007da | |
| parent | 438e6b7240905c8055f9e221187f2ac818876169 (diff) | |
Log the correct ending timestamp in recovery_target_xid mode.
When ending recovery based on recovery_target_xid matching with
recovery_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 in
c945af80c: the code to fetch recordXtime out of the commit/abort
record used to be executed unconditionally, but it was changed
to get called only in the RECOVERY_TARGET_TIME case. We need only
flip the order of operations to restore the intended behavior.
Per report from Torsten Förtsch. Back-patch to all supported
branches.
Discussion: https://postgr.es/m/CAKkG4_kUevPqbmyOfLajx7opAQk6Cvwkvx0HRcFjSPfRPTXanA@mail.gmail.com
| -rw-r--r-- | src/backend/access/transam/xlogrecovery.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index 5e65785306..c14d1f3ef6 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -2548,8 +2548,13 @@ recoveryStopsBefore(XLogReaderState *record) stopsHere = (recordXid == recoveryTargetXid); } - if (recoveryTarget == RECOVERY_TARGET_TIME && - getRecordTimestamp(record, &recordXtime)) + /* + * Note: we must fetch recordXtime regardless of recoveryTarget setting. + * We don't expect getRecordTimestamp ever to fail, since we already know + * this is a commit or abort record; but test its result anyway. + */ + if (getRecordTimestamp(record, &recordXtime) && + recoveryTarget == RECOVERY_TARGET_TIME) { /* * There can be many transactions that share the same commit time, so |