aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2012-11-08 10:25:58 +0200
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2012-11-08 10:28:52 +0200
commita9dad56441e4bc5d20c34bd56daf8e72df1b22d3 (patch)
treebdd539d9089762ee3a7a5d293d630fb166652cf2 /doc/src
parent9e45e03886c75dd049bcc1b063e0bf34e46a3a62 (diff)
downloadpostgresql-a9dad56441e4bc5d20c34bd56daf8e72df1b22d3.tar.gz
postgresql-a9dad56441e4bc5d20c34bd56daf8e72df1b22d3.zip
Teach pg_basebackup and pg_receivexlog to reply to server keepalives.
Without this, the connection will be killed after timeout if wal_sender_timeout is set in the server. Original patch by Amit Kapila, modified by me to fit recent changes in the code.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/pg_basebackup.sgml8
-rw-r--r--doc/src/sgml/ref/pg_receivexlog.sgml7
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index a951d6b0f04..0bc3ca27b16 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -377,10 +377,10 @@ PostgreSQL documentation
<listitem>
<para>
Specifies the number of seconds between status packets sent back to the
- server. This is required when streaming the transaction log (using
- <literal>--xlog=stream</literal>) if replication timeout is configured
- on the server, and allows for easier monitoring. A value of zero disables
- the status updates completely. The default value is 10 seconds.
+ server. This allows for easier monitoring of the progress from server.
+ A value of zero disables the periodic status updates completely,
+ although an update will still be sent when requested by the server, to
+ avoid timeout disconnect. The default value is 10 seconds.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivexlog.sgml
index 7f62fd9e615..d06dd1f171c 100644
--- a/doc/src/sgml/ref/pg_receivexlog.sgml
+++ b/doc/src/sgml/ref/pg_receivexlog.sgml
@@ -155,9 +155,10 @@ PostgreSQL documentation
<listitem>
<para>
Specifies the number of seconds between status packets sent back to the
- server. This is required if replication timeout is configured on the
- server, and allows for easier monitoring. A value of zero disables the
- status updates completely. The default value is 10 seconds.
+ server. This allows for easier monitoring of the progress from server.
+ A value of zero disables the periodic status updates completely,
+ although an update will still be sent when requested by the server, to
+ avoid timeout disconnect. The default value is 10 seconds.
</para>
</listitem>
</varlistentry>