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

Commit f4fa92f

Browse files
committed
Fix WAL recycling on standbys depending on archive_mode
A restart point or a checkpoint recycling WAL segments treats segments marked with neither ".done" (archiving is done) or ".ready" (segment is ready to be archived) in archive_status the same way for archive_mode being "on" or "always". While for a primary this is fine, a standby running a restart point with archive_mode = on would try to mark such a segment as ready for archiving, which is something that will never happen except after the standby is promoted. Note that this problem applies only to WAL segments coming from the local pg_wal the first time archive recovery is run. Segments part of a self-contained base backup are the most common case where this could happen, however even in this case normally the .done markers would be most likely part of the backup. Segments recovered from an archive are marked as .ready or .done by the startup process, and segments finished streaming are marked as such by the WAL receiver, so they are handled already. Reported-by: Haruka Takatsuka Author: Michael Paquier Discussion: https://postgr.es/m/15402-a453c90ed4cf88b2@postgresql.org Backpatch-through: 9.5, where archive_mode = always has been added.
1 parent bdf11d6 commit f4fa92f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/backend/access/transam/xlogarchive.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,16 @@ XLogArchiveCheckDone(const char *xlog)
619619
{
620620
char archiveStatusPath[MAXPGPATH];
621621
struct stat stat_buf;
622+
bool inRecovery = RecoveryInProgress();
622623

623-
/* Always deletable if archiving is off */
624-
if (!XLogArchivingActive())
624+
/*
625+
* The file is always deletable if archive_mode is "off". On standbys
626+
* archiving is disabled if archive_mode is "on", and enabled with
627+
* "always". On a primary, archiving is enabled if archive_mode is "on"
628+
* or "always".
629+
*/
630+
if (!((XLogArchivingActive() && !inRecovery) ||
631+
(XLogArchivingAlways() && inRecovery)))
625632
return true;
626633

627634
/* First check for .done --- this means archiver is done with it */

0 commit comments

Comments
 (0)