Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 059caf3

Browse files
committed
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
1 parent 1aedaba commit 059caf3

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

doc/src/sgml/high-availability.sgml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,8 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
13961396
If <varname>archive_mode</varname> is set to <literal>on</literal>, the
13971397
archiver is not enabled during recovery or standby mode. If the standby
13981398
server is promoted, it will start archiving after the promotion, but
1399-
will not archive any WAL it did not generate itself. To get a complete
1399+
will not archive any WAL or timeline history files that
1400+
it did not generate itself. To get a complete
14001401
series of WAL files in the archive, you must ensure that all WAL is
14011402
archived, before it reaches the standby. This is inherently true with
14021403
file-based log shipping, as the standby can only restore files that

src/backend/replication/walreceiver.c

+9
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,15 @@ WalRcvFetchTimeLineHistoryFiles(TimeLineID first, TimeLineID last)
761761
*/
762762
writeTimeLineHistoryFile(tli, content, len);
763763

764+
/*
765+
* Mark the streamed history file as ready for archiving
766+
* if archive_mode is always.
767+
*/
768+
if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
769+
XLogArchiveForceDone(fname);
770+
else
771+
XLogArchiveNotify(fname);
772+
764773
pfree(fname);
765774
pfree(content);
766775
}

0 commit comments

Comments
 (0)