diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/config.sgml | 36 | ||||
| -rw-r--r-- | doc/src/sgml/release-9.1.sgml | 2 |
2 files changed, 23 insertions, 15 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 83884164305..b4fcbaf9c7d 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -2236,10 +2236,10 @@ include 'filename' </listitem> </varlistentry> - <varlistentry id="guc-replication-timeout" xreflabel="replication_timeout"> - <term><varname>replication_timeout</varname> (<type>integer</type>)</term> + <varlistentry id="guc-wal-sender-timeout" xreflabel="wal_sender_timeout"> + <term><varname>wal_sender_timeout</varname> (<type>integer</type>)</term> <indexterm> - <primary><varname>replication_timeout</> configuration parameter</primary> + <primary><varname>wal_sender_timeout</> configuration parameter</primary> </indexterm> <listitem> <para> @@ -2251,12 +2251,6 @@ include 'filename' the <filename>postgresql.conf</> file or on the server command line. The default value is 60 seconds. </para> - <para> - To prevent connections from being terminated prematurely, - <xref linkend="guc-wal-receiver-status-interval"> - must be enabled on the standby, and its value must be less than the - value of <varname>replication_timeout</>. - </para> </listitem> </varlistentry> @@ -2474,11 +2468,6 @@ include 'filename' the <filename>postgresql.conf</> file or on the server command line. The default value is 10 seconds. </para> - <para> - When <xref linkend="guc-replication-timeout"> is enabled on a sending server, - <varname>wal_receiver_status_interval</> must be enabled, and its value - must be less than the value of <varname>replication_timeout</>. - </para> </listitem> </varlistentry> @@ -2507,6 +2496,25 @@ include 'filename' </listitem> </varlistentry> + <varlistentry id="guc-wal-receiver-timeout" xreflabel="wal_receiver_timeout"> + <term><varname>wal_receiver_timeout</varname> (<type>integer</type>)</term> + <indexterm> + <primary><varname>wal_receiver_timeout</> configuration parameter</primary> + </indexterm> + <listitem> + <para> + Terminate replication connections that are inactive longer + than the specified number of milliseconds. This is useful for + the receiving standby server to detect a primary node crash or network + outage. + A value of zero disables the timeout mechanism. This parameter + can only be set in + the <filename>postgresql.conf</> file or on the server command line. + The default value is 60 seconds. + </para> + </listitem> + </varlistentry> + </variablelist> </sect2> </sect1> diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml index 6bc1c8c90eb..5fbdd7a1952 100644 --- a/doc/src/sgml/release-9.1.sgml +++ b/doc/src/sgml/release-9.1.sgml @@ -3322,7 +3322,7 @@ <listitem> <para> Add - <link linkend="guc-replication-timeout"><varname>replication_timeout</></link> + <varname>replication_timeout</> setting (Fujii Masao, Heikki Linnakangas) </para> |