Document max_standby_delay=-1 option, now that it's allowed again.

This commit is contained in:
Heikki Linnakangas 2010-02-27 09:29:20 +00:00
parent 4ec700a8ec
commit 7ab9305cc9
2 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.254 2010/02/25 19:20:38 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.255 2010/02/27 09:29:20 heikki Exp $ -->
<chapter Id="runtime-config">
<title>Server Configuration</title>
@ -1868,9 +1868,8 @@ archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"' # Windows
described in <xref linkend="hot-standby-conflict">. Typically,
this parameter makes sense only during replication, so when
performing an archive recovery to recover from data loss a very high
parameter setting is recommended. The default is 30 seconds.
There is no wait-forever setting because of the potential for deadlock
which that setting would introduce.
parameter setting or -1 which means wait forever is recommended.
The default is 30 seconds.
This parameter can only be set in the <filename>postgresql.conf</>
file or on the server command line.
</para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.51 2010/02/25 09:16:42 heikki Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.52 2010/02/27 09:29:20 heikki Exp $ -->
<chapter id="high-availability">
<title>High Availability, Load Balancing, and Replication</title>
@ -1521,7 +1521,10 @@ LOG: database system is ready to accept read only connections
<varname>max_standby_delay</> or even set it to zero, though that is a
very aggressive setting. If the standby server is tasked as an additional
server for decision support queries then it might be acceptable to set this
to a value of many hours (in seconds).
to a value of many hours (in seconds). It is also possible to set
<varname>max_standby_delay</> to -1 which means wait forever for queries
to complete, if there are conflicts; this will be useful when performing
an archive recovery from a backup.
</para>
<para>