]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix timestamp in end-of-recovery WAL records.
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Fri, 19 Dec 2014 15:00:21 +0000 (17:00 +0200)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Fri, 19 Dec 2014 15:03:49 +0000 (17:03 +0200)
We used time(null) to set a TimestampTz field, which gave bogus results.
Noticed while looking at pg_xlogdump output.

Backpatch to 9.3 and above, where the fast promotion was introduced.

src/backend/access/transam/xlog.c

index b2443c082e8fc23e86c2c09f4fb7bcddc3a723df..b44aec46cf7c113dbe1b4aa84ee4c34516791330 100644 (file)
@@ -8408,7 +8408,7 @@ CreateEndOfRecoveryRecord(void)
        if (!RecoveryInProgress())
                elog(ERROR, "can only be used to end recovery");
 
-       xlrec.end_time = time(NULL);
+       xlrec.end_time = GetCurrentTimestamp();
 
        WALInsertLockAcquireExclusive();
        xlrec.ThisTimeLineID = ThisTimeLineID;
@@ -8433,7 +8433,7 @@ CreateEndOfRecoveryRecord(void)
         * changes to this point.
         */
        LWLockAcquire(ControlFileLock, LW_EXCLUSIVE);
-       ControlFile->time = (pg_time_t) xlrec.end_time;
+       ControlFile->time = (pg_time_t) time(NULL);
        ControlFile->minRecoveryPoint = recptr;
        ControlFile->minRecoveryPointTLI = ThisTimeLineID;
        UpdateControlFile();