From: Noah Misch <noah@leadboat.com>
Date: Fri, 5 Aug 2022 15:30:55 +0000 (-0700)
Subject: Be more prescriptive in new doc about re-archiving of same WAL file.
X-Git-Tag: REL_16_BETA1~2048
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d263ced225bffe2c340175125b0270d1869138fe;p=thirdparty%2Fpostgresql.git

Be more prescriptive in new doc about re-archiving of same WAL file.

Nathan Bossart, reviewed by David Steele.

Discussion: https://postgr.es/m/20220731065156.GA3694276@rfd.leadboat.com
---

diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index e432bb015a6..cd83646407d 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -688,16 +688,14 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
    <para>
     In rare cases, <productname>PostgreSQL</productname> may attempt to
     re-archive a WAL file that was previously archived.  For example, if the
-    system crashes before the server makes a durable record of archival success,
-    the server will attempt to archive the file again after restarting (provided
-    archiving is still enabled).  When an archive library encounters a
-    pre-existing file, it may return <literal>true</literal> if the WAL file has
-    identical contents to the pre-existing archive and the pre-existing archive
-    is fully persisted to storage.  Alternatively, the archive library may
-    return <literal>false</literal> anytime a pre-existing file is encountered,
-    but this will require manual action by an administrator to resolve.  If a
-    pre-existing file contains different contents than the WAL file being
-    archived, the archive library <emphasis>must</emphasis> return
+    system crashes before the server makes a durable record of archival
+    success, the server will attempt to archive the file again after
+    restarting (provided archiving is still enabled).  When an archive library
+    encounters a pre-existing file, it should return <literal>true</literal>
+    if the WAL file has identical contents to the pre-existing archive and the
+    pre-existing archive is fully persisted to storage.  If a pre-existing
+    file contains different contents than the WAL file being archived, the
+    archive library <emphasis>must</emphasis> return
     <literal>false</literal>.
    </para>