diff options
| author | Michael Paquier <michael@paquier.xyz> | 2018-09-28 11:56:11 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2018-09-28 11:56:11 +0900 |
| commit | ed9d6d621a0933388aba3d3b150882b2ef6b8d01 (patch) | |
| tree | 1364b3bc52a3250c13e50466f2d01d7bc8bb1404 /src | |
| parent | 992f8542a370d6885fc19e79e0fc46a1ebf902cb (diff) | |
| download | postgresql-ed9d6d621a0933388aba3d3b150882b2ef6b8d01.tar.gz postgresql-ed9d6d621a0933388aba3d3b150882b2ef6b8d01.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/xlogarchive.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c index 4538f178acc..c899594fb67 100644 --- a/src/backend/access/transam/xlogarchive.c +++ b/src/backend/access/transam/xlogarchive.c @@ -619,9 +619,16 @@ XLogArchiveCheckDone(const char *xlog) { char archiveStatusPath[MAXPGPATH]; struct stat stat_buf; + bool inRecovery = RecoveryInProgress(); - /* Always deletable if archiving is off */ - if (!XLogArchivingActive()) + /* + * The file is always deletable if archive_mode is "off". On standbys + * archiving is disabled if archive_mode is "on", and enabled with + * "always". On a primary, archiving is enabled if archive_mode is "on" + * or "always". + */ + if (!((XLogArchivingActive() && !inRecovery) || + (XLogArchivingAlways() && inRecovery))) return true; /* First check for .done --- this means archiver is done with it */ |