Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a9f72b4

Browse files
committed
Improve recovery.conf.sample comments.
Jehan-Guillaume de Rorthais, with some additional wordsmithing by me.
1 parent a755ea3 commit a9f72b4

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

src/backend/access/transam/recovery.conf.sample

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# -------------------------------
44
#
55
# Edit this file to provide the parameters that PostgreSQL needs to
6-
# perform an archive recovery of a database, or to act as a log-streaming
7-
# replication standby.
6+
# perform an archive recovery of a database, or to act as a replication
7+
# standby.
88
#
99
# If "recovery.conf" is present in the PostgreSQL data directory, it is
1010
# read on postmaster startup. After successful recovery, it is renamed
@@ -88,21 +88,27 @@
8888
# STANDBY SERVER PARAMETERS
8989
#---------------------------------------------------------------------------
9090
#
91-
# When standby_mode is enabled, the PostgreSQL server will work as
92-
# a standby. It tries to connect to the primary according to the
93-
# connection settings primary_conninfo, and receives XLOG records
94-
# continuously.
91+
# standby_mode
92+
#
93+
# When standby_mode is enabled, the PostgreSQL server will work as a
94+
# standby. It will continuously wait for the additional XLOG records, using
95+
# restore_command and/or primary_conninfo.
9596
#
9697
#standby_mode = off
9798
#
99+
# primary_conninfo
100+
#
101+
# If set, the PostgreSQL server will try to connect to the primary using this
102+
# connection string and receive XLOG records continuously.
103+
#
98104
#primary_conninfo = '' # e.g. 'host=localhost port=5432'
99105
#
100106
#
101-
# By default, a standby server keeps streaming XLOG records from the
102-
# primary indefinitely. If you want to stop streaming and finish recovery,
103-
# opening up the system in read/write mode, specify path to a trigger file.
104-
# Server will poll the trigger file path periodically and stop streaming
105-
# when it's found.
107+
# By default, a standby server keeps restoring XLOG records from the
108+
# primary indefinitely. If you want to stop the standby mode, finish recovery
109+
# and open the system in read/write mode, specify path to a trigger file.
110+
# The server will poll the trigger file path periodically and start as a
111+
# primary server when it's found.
106112
#
107113
#trigger_file = ''
108114
#

0 commit comments

Comments
 (0)