Prevent the already-archived WAL file from being archived again.

Previously the archive recovery always created .ready file for
the last WAL file of the old timeline at the end of recovery even when
it's restored from the archive and has .done file. That is, there was
the case where the WAL file had both .ready and .done files.
This caused the already-archived WAL file to be archived again.

This commit prevents the archive recovery from creating .ready file
for the last WAL file if it has .done file, in order to prevent it from
being archived again.

This bug was added when cascading replication feature was introduced,
i.e., the commit 5286105800c7d5902f98f32e11b209c471c0c69c.
So, back-patch to 9.2, where cascading replication was added.

Reviewed by Michael Paquier

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 7e35e0f41f5983dfabc2c7b02b67f5e3657506ec..e689b4b9f014fbe6fbfdba4e269ce2a7b5e182bb 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5334,7 +5334,7 @@ static void
 exitArchiveRecovery(TimeLineID endTLI, XLogSegNo endLogSegNo)
 {
        char            recoveryPath[MAXPGPATH];
-       char            xlogpath[MAXPGPATH];
+       char            xlogfname[MAXFNAMELEN];
 
        /*
         * We are no longer in archive recovery state.
@@ -5362,17 +5362,19 @@ exitArchiveRecovery(TimeLineID endTLI, XLogSegNo endLogSegNo)
         * for the new timeline.
         *
         * Notify the archiver that the last WAL segment of the old timeline is
-        * ready to copy to archival storage. Otherwise, it is not archived for a
-        * while.
+        * ready to copy to archival storage if its .done file doesn't exist
+        * (e.g., if it's the restored WAL file, it's expected to have .done file).
+        * Otherwise, it is not archived for a while.
         */
        if (endTLI != ThisTimeLineID)
        {
                XLogFileCopy(endLogSegNo, endTLI, endLogSegNo);
 
+               /* Create .ready file only when neither .ready nor .done files exist */
                if (XLogArchivingActive())
                {
-                       XLogFileName(xlogpath, endTLI, endLogSegNo);
-                       XLogArchiveNotify(xlogpath);
+                       XLogFileName(xlogfname, endTLI, endLogSegNo);
+                       XLogArchiveCheckDone(xlogfname);
                }
        }
 
@@ -5380,8 +5382,8 @@ exitArchiveRecovery(TimeLineID endTLI, XLogSegNo endLogSegNo)
         * Let's just make real sure there are not .ready or .done flags posted
         * for the new segment.
         */
-       XLogFileName(xlogpath, ThisTimeLineID, endLogSegNo);
-       XLogArchiveCleanup(xlogpath);
+       XLogFileName(xlogfname, ThisTimeLineID, endLogSegNo);
+       XLogArchiveCleanup(xlogfname);
 
        /*
         * Since there might be a partial WAL segment named RECOVERYXLOG, get rid