summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2009-06-26 22:06:11 +0000
committerTom Lane2009-06-26 22:06:11 +0000
commit8937f5644bf0434a7c5e3d0aa8d948f20aa99949 (patch)
tree482f195e7d8bf53516d936eb5b062a48d6b57e9c
parent7e60527f5176ccaddcbc2088c10a9224c09a364f (diff)
Marginal improvement of description of recovery_end_command.
-rw-r--r--doc/src/sgml/backup.sgml21
1 files changed, 13 insertions, 8 deletions
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 1086e4f5d0..372321ed19 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -1108,8 +1108,9 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
last valid restart point. That is the earliest file that must be kept
to allow a restore to be restartable, so this information can be used
to truncate the archive to just the minimum required to support
- restart of the current restore. <literal>%r</> would only be used in a
- warm-standby configuration (see <xref linkend="warm-standby">).
+ restart from the current restore. <literal>%r</> would typically be
+ used in a warm-standby configuration
+ (see <xref linkend="warm-standby">).
Write <literal>%%</> to embed an actual <literal>%</> character
in the command.
</para>
@@ -1132,19 +1133,23 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
<para>
This parameter specifies a shell command that will be executed once only
at the end of recovery. This parameter is optional. The purpose of the
- recovery_end_command is to provide a mechanism for cleanup following
- replication or recovery.
+ <varname>recovery_end_command</> is to provide a mechanism for cleanup
+ following replication or recovery.
Any <literal>%r</> is replaced by the name of the file
containing the last valid restart point. That is the earliest file that
must be kept to allow a restore to be restartable, so this information
can be used to truncate the archive to just the minimum required to
- support restart of the current restore. <literal>%r</> would only be
- used in a warm-standby configuration (see <xref linkend="warm-standby">).
+ support restart from the current restore. <literal>%r</> would
+ typically be used in a warm-standby configuration
+ (see <xref linkend="warm-standby">).
Write <literal>%%</> to embed an actual <literal>%</> character
in the command.
+ </para>
+ <para>
If the command returns a non-zero exit status then a WARNING log
- message will be written, unless signalled in which case we return
- a FATAL error.
+ message will be written and the database will proceed to start up
+ anyway. An exception is that if the command was terminated by a
+ signal, the database will not proceed with startup.
</para>
</listitem>
</varlistentry>