Archive timeline history files in standby if archive_mode is set to "always".

Previously the standby server didn't archive timeline history files
streamed from the primary even when archive_mode is set to "always",
while it archives the streamed WAL files. This could cause the PITR to
fail because there was no required timeline history file in the archive.
The cause of this issue was that walreceiver didn't mark those files as
ready for archiving.

This commit makes walreceiver mark those streamed timeline history
files as ready for archiving if archive_mode=always. Then the archiver
process archives the marked timeline history files.

Back-patch to all supported versions.

Reported-by: Grigory Smolkin
Author: Grigory Smolkin, Fujii Masao
Reviewed-by: David Zhang, Anastasia Lubennikova
Discussion: https://postgr.es/m/54b059d4-2b48-13a4-6f43-95a087c92367@postgrespro.ru

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 1f3d1ea0139ae3948f1428e319ae53853c4ef3ee..c34f475a3a9a4aff474dfdd82c8c689d2904999b 100644 (file)
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1383,7 +1383,8 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
      If archive_mode is set to on, the
      archiver is not enabled during recovery or standby mode. If the standby
      server is promoted, it will start archiving after the promotion, but
-     will not archive any WAL it did not generate itself. To get a complete
+     will not archive any WAL or timeline history files that
+     it did not generate itself. To get a complete
      series of WAL files in the archive, you must ensure that all WAL is
      archived, before it reaches the standby. This is inherently true with
      file-based log shipping, as the standby can only restore files that

diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
index e4beaada12fb1f84b650ad312fe032630d24184e..75ec9859533718135d552329b5d3b39d3545ca99 100644 (file)
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -733,6 +733,15 @@ WalRcvFetchTimeLineHistoryFiles(TimeLineID first, TimeLineID last)
             */
            writeTimeLineHistoryFile(tli, content, len);
 
+           /*
+            * Mark the streamed history file as ready for archiving
+            * if archive_mode is always.
+            */
+           if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
+               XLogArchiveForceDone(fname);
+           else
+               XLogArchiveNotify(fname);
+
            pfree(fname);
            pfree(content);
        }