Edit recovery.conf.sample so it matches docs. Change standby_mode

simonat2ndQuadrant · simonat2ndQuadrant · commit de66effede5f · 2010-03-29T18:50:36.000Z
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.
diff --git 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,16 +47,26 @@
 #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.
 # This can be useful for cleaning up after the restore_command.
 #
 #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
 #
 #---------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`# which is replaced by the absolute path to copy the log file to.`
`36`	`36`	`#`
`37`	`37`	`# This parameter is required for an archive recovery, but optional`
`38`		`-# for replication.`
	`38`	`+# for streaming replication.`
`39`	`39`	`#`
`40`	`40`	`# It is important that the command return nonzero exit status on failure.`
`41`	`41`	`# The command will be asked for log files that are not present in the`
`@@ -47,16 +47,26 @@`
`47`	`47`	`#restore_command = 'cp /mnt/server/archivedir/%f %p'`
`48`	`48`	`#`
`49`	`49`	`#`
	`50`	`+# restartpoint_command`
	`51`	`+#`
	`52`	`+# specifies an optional shell command to execute at every restartpoint.`
	`53`	`+# This can be useful for cleaning up the archive of a standby server.`
	`54`	`+#`
	`55`	`+#restartpoint_command = ''`
	`56`	`+#`
`50`	`57`	`# recovery_end_command`
`51`	`58`	`#`
`52`	`59`	`# specifies an optional shell command to execute at completion of recovery.`
`53`	`60`	`# This can be useful for cleaning up after the restore_command.`
`54`	`61`	`#`
`55`	`62`	`#recovery_end_command = ''`
`56`	`63`	`#`
	`64`	`+#---------------------------------------------------------------------------`
	`65`	`+# RECOVERY TARGET PARAMETERS`
	`66`	`+#---------------------------------------------------------------------------`
`57`	`67`	`#`
`58`	`68`	`# By default, recovery will rollforward to the end of the WAL log.`
`59`		`-# If you want to stop rollforward before that point, you`
	`69`	`+# If you want to stop rollforward at a specific point, you`
`60`	`70`	`# must set a recovery target.`
`61`	`71`	`#`
`62`	`72`	`# You may set a recovery target either by transactionId, or`
`@@ -77,7 +87,6 @@`
`77`	`87`	`#`
`78`	`88`	`#recovery_target_timeline = '33' # number or 'latest'`
`79`	`89`	`#`
`80`		`-#`
`81`	`90`	`#---------------------------------------------------------------------------`
`82`	`91`	`# LOG-STREAMING REPLICATION PARAMETERS`
`83`	`92`	`#---------------------------------------------------------------------------`
`@@ -87,7 +96,7 @@`
`87`	`96`	`# connection settings primary_conninfo, and receives XLOG records`
`88`	`97`	`# continuously.`
`89`	`98`	`#`
`90`		`-#standby_mode = 'false' # 'true' or 'false'`
	`99`	`+#standby_mode = 'off' # 'on' or 'off'`
`91`	`100`	`#`
`92`	`101`	`#primary_conninfo = 'host=localhost port=5432'`
`93`	`102`	`#`
`@@ -104,7 +113,6 @@`
`104`	`113`	`# HOT STANDBY PARAMETERS`
`105`	`114`	`#---------------------------------------------------------------------------`
`106`	`115`	`#`
`107`		`-# If you want to enable read-only connections during recovery, enable`
`108`		`-# recovery_connections in postgresql.conf`
	`116`	`+# Hot Standby related parameters are listed in postgresql.conf`
`109`	`117`	`#`
`110`	`118`	`#---------------------------------------------------------------------------`