Correct epoch of txid_current() when executed on a Hot Standby server.

Initialise ckptXidEpoch from starting checkpoint and maintain the correct
value as we roll forwards. This allows GetNextXidAndEpoch() to return the
correct epoch when executed during recovery. Backpatch to 9.0 when the
problem is first observable by a user.

Bug report from Daniel Farina

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 85cb2accc32f1cf31cea0910823292fa23f53b56..3902c583134449e6873fddc5da4845245e91f65a 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6022,6 +6022,10 @@ StartupXLOG(void)
                /* No need to hold ControlFileLock yet, we aren't up far enough */
                UpdateControlFile();
 
+               /* initialize shared-memory copy of latest checkpoint XID/epoch */
+               XLogCtl->ckptXidEpoch = ControlFile->checkPointCopy.nextXidEpoch;
+               XLogCtl->ckptXid = ControlFile->checkPointCopy.nextXid;
+
                /* initialize our local copy of minRecoveryPoint */
                minRecoveryPoint = ControlFile->minRecoveryPoint;
 
@@ -6529,10 +6533,6 @@ StartupXLOG(void)
        /* start the archive_timeout timer running */
        XLogCtl->Write.lastSegSwitchTime = (pg_time_t) time(NULL);
 
-       /* initialize shared-memory copy of latest checkpoint XID/epoch */
-       XLogCtl->ckptXidEpoch = ControlFile->checkPointCopy.nextXidEpoch;
-       XLogCtl->ckptXid = ControlFile->checkPointCopy.nextXid;
-
        /* also initialize latestCompletedXid, to nextXid - 1 */
        ShmemVariableCache->latestCompletedXid = ShmemVariableCache->nextXid;
        TransactionIdRetreat(ShmemVariableCache->latestCompletedXid);
@@ -8013,6 +8013,17 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
                ControlFile->checkPointCopy.nextXidEpoch = checkPoint.nextXidEpoch;
                ControlFile->checkPointCopy.nextXid = checkPoint.nextXid;
 
+               /* Update shared-memory copy of checkpoint XID/epoch */
+               {
+                       /* use volatile pointer to prevent code rearrangement */
+                       volatile XLogCtlData *xlogctl = XLogCtl;
+
+                       SpinLockAcquire(&xlogctl->info_lck);
+                       xlogctl->ckptXidEpoch = checkPoint.nextXidEpoch;
+                       xlogctl->ckptXid = checkPoint.nextXid;
+                       SpinLockRelease(&xlogctl->info_lck);
+               }
+
                /*
                 * TLI may change in a shutdown checkpoint, but it shouldn't decrease
                 */
@@ -8053,6 +8064,17 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
                ControlFile->checkPointCopy.nextXidEpoch = checkPoint.nextXidEpoch;
                ControlFile->checkPointCopy.nextXid = checkPoint.nextXid;
 
+               /* Update shared-memory copy of checkpoint XID/epoch */
+               {
+                       /* use volatile pointer to prevent code rearrangement */
+                       volatile XLogCtlData *xlogctl = XLogCtl;
+
+                       SpinLockAcquire(&xlogctl->info_lck);
+                       xlogctl->ckptXidEpoch = checkPoint.nextXidEpoch;
+                       xlogctl->ckptXid = checkPoint.nextXid;
+                       SpinLockRelease(&xlogctl->info_lck);
+               }
+
                /* TLI should not change in an on-line checkpoint */
                if (checkPoint.ThisTimeLineID != ThisTimeLineID)
                        ereport(PANIC,