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

Commit fd26f78

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 e66bcfb commit fd26f78

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
@@ -1395,7 +1395,8 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
13951395
If <varname>archive_mode</varname> is set to <literal>on</literal>, the
13961396
archiver is not enabled during recovery or standby mode. If the standby
13971397
server is promoted, it will start archiving after the promotion, but
1398-
will not archive any WAL it did not generate itself. To get a complete
1398+
will not archive any WAL or timeline history files that
1399+
it did not generate itself. To get a complete
13991400
series of WAL files in the archive, you must ensure that all WAL is
14001401
archived, before it reaches the standby. This is inherently true with
14011402
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
@@ -758,6 +758,15 @@ WalRcvFetchTimeLineHistoryFiles(TimeLineID first, TimeLineID last)
758758
*/
759759
writeTimeLineHistoryFile(tli, content, len);
760760

761+
/*
762+
* Mark the streamed history file as ready for archiving
763+
* if archive_mode is always.
764+
*/
765+
if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
766+
XLogArchiveForceDone(fname);
767+
else
768+
XLogArchiveNotify(fname);
769+
761770
pfree(fname);
762771
pfree(content);
763772
}

0 commit comments

Comments
 (0)