diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-03-29 18:50:36 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-03-29 18:50:36 +0000 |
| commit | de66effede5f7cb6da258e1bfe6fc508ad4cf940 (patch) | |
| tree | d437d42932b59dab1360cbb237c84b63b2721f83 /src/backend/access/transam | |
| parent | b78f6264eba33e2966447572b8261e353df01e59 (diff) | |
| download | postgresql-de66effede5f7cb6da258e1bfe6fc508ad4cf940.tar.gz postgresql-de66effede5f7cb6da258e1bfe6fc508ad4cf940.zip | |
Edit recovery.conf.sample so it matches docs. Change standby_mode
example to 'on or 'off' rather than 'true' or 'false', as shown
in docs. Add restartpoint_command. Add section header for recovery
target parameters, matching docs.
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/recovery.conf.sample | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/backend/access/transam/recovery.conf.sample b/src/backend/access/transam/recovery.conf.sample index 34d3b613bcd..e2fce7ad8b2 100644 --- a/src/backend/access/transam/recovery.conf.sample +++ b/src/backend/access/transam/recovery.conf.sample @@ -35,7 +35,7 @@ # which is replaced by the absolute path to copy the log file to. # # This parameter is *required* for an archive recovery, but optional -# for replication. +# for streaming replication. # # It is important that the command return nonzero exit status on failure. # The command *will* be asked for log files that are not present in the @@ -47,6 +47,13 @@ #restore_command = 'cp /mnt/server/archivedir/%f %p' # # +# restartpoint_command +# +# specifies an optional shell command to execute at every restartpoint. +# This can be useful for cleaning up the archive of a standby server. +# +#restartpoint_command = '' +# # recovery_end_command # # specifies an optional shell command to execute at completion of recovery. @@ -54,9 +61,12 @@ # #recovery_end_command = '' # +#--------------------------------------------------------------------------- +# RECOVERY TARGET PARAMETERS +#--------------------------------------------------------------------------- # # By default, recovery will rollforward to the end of the WAL log. -# If you want to stop rollforward before that point, you +# If you want to stop rollforward at a specific point, you # must set a recovery target. # # You may set a recovery target either by transactionId, or @@ -77,7 +87,6 @@ # #recovery_target_timeline = '33' # number or 'latest' # -# #--------------------------------------------------------------------------- # LOG-STREAMING REPLICATION PARAMETERS #--------------------------------------------------------------------------- @@ -87,7 +96,7 @@ # connection settings primary_conninfo, and receives XLOG records # continuously. # -#standby_mode = 'false' # 'true' or 'false' +#standby_mode = 'off' # 'on' or 'off' # #primary_conninfo = 'host=localhost port=5432' # @@ -104,7 +113,6 @@ # HOT STANDBY PARAMETERS #--------------------------------------------------------------------------- # -# If you want to enable read-only connections during recovery, enable -# recovery_connections in postgresql.conf +# Hot Standby related parameters are listed in postgresql.conf # #--------------------------------------------------------------------------- |