XidEpoch++ if wraparound during checkpoint.

If wal_level = hot_standby we update the checkpoint nextxid,
though in the case where a wraparound occurred half-way through
a checkpoint we would neglect updating the epoch also. Updating
the nextxid is arguably the wrong thing to do, but changing that
may introduce subtle bugs into hot standby startup, while updating
the value doesn't cause any known bugs yet. Minimal fix now to
HEAD and backbranches, wider fix later in HEAD.

Bug reported in #6291 by Daniel Farina and slightly differently in

Cause analysis and recommended fixes from Tom Lane and Andres Freund.

Applied patch is minimal version of Andres Freund's work.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 9328ad38f4d107714e068d910e09bfd1a3d5b551..5a06ae2a4a3560c15c9fd9fb07f61d8db21a8a63 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -8020,10 +8020,17 @@ CreateCheckPoint(int flags)
         * If we are shutting down, or Startup process is completing crash
         * recovery we don't need to write running xact data.
         *
-        * Update checkPoint.nextXid since we have a later value
+        * Update checkPoint.nextXid since we may have a later value. If we
+        * do update the value, and we have wrapped, increment epoch also.
         */
        if (!shutdown && XLogStandbyInfoActive())
+       {
+               TransactionId prevXid = checkPoint.nextXid;
+
                LogStandbySnapshot(&checkPoint.nextXid);
+               if (checkPoint.nextXid < prevXid)
+                       checkPoint.nextXidEpoch++;
+       }
 
        START_CRIT_SECTION();