diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-07 15:10:32 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-07-07 15:11:56 -0400 |
| commit | db43ec43cc4ea68a45ee3364488285edbd790893 (patch) | |
| tree | 58f2e4c4d9a586a80ee2512e7777d4f00c002236 /src/backend/utils/misc/postgresql.conf.sample | |
| parent | a392b5247870da806e511ae2aadb0464509f7afe (diff) | |
Reclassify replication-related GUC variables as "master" and "standby".
Per discussion, this structure seems more understandable than what was
there before. Make config.sgml and postgresql.conf.sample agree.
In passing do a bit of editorial work on the variable descriptions.
Diffstat (limited to 'src/backend/utils/misc/postgresql.conf.sample')
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 655dad42c71..e5e7c1a5850 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -184,32 +184,41 @@ #archive_timeout = 0 # force a logfile segment switch after this # number of seconds; 0 disables -# - Streaming Replication - Server Settings -#synchronous_standby_names = '' # standby servers that provide sync rep - # comma-separated list of application_name from standby(s); - # '*' = all +#------------------------------------------------------------------------------ +# REPLICATION +#------------------------------------------------------------------------------ +# - Master Server - + +# These settings are ignored on a standby server #max_wal_senders = 0 # max number of walsender processes # (change requires restart) #wal_sender_delay = 1s # walsender cycle time, 1-10000 milliseconds #wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables #vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed -#replication_timeout = 60s # in milliseconds, 0 is disabled +#replication_timeout = 60s # in milliseconds; 0 disables +#synchronous_standby_names = '' # standby servers that provide sync rep + # comma-separated list of application_name + # from standby(s); '*' = all # - Standby Servers - +# These settings are ignored on a master server + #hot_standby = off # "on" allows queries during recovery # (change requires restart) -#hot_standby_feedback = off # info from standby to prevent query conflicts #max_standby_archive_delay = 30s # max delay before canceling queries # when reading WAL from archive; # -1 allows indefinite delay #max_standby_streaming_delay = 30s # max delay before canceling queries # when reading streaming WAL; # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # replies at least this often, 0 disables +#wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables +#hot_standby_feedback = off # send info from standby to prevent + # query conflicts #------------------------------------------------------------------------------ |