diff options
| author | Robert Haas <rhaas@postgresql.org> | 2011-04-04 16:13:01 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2011-04-04 16:25:52 -0400 |
| commit | 240067b3b0ff989d2b28f4f917f7958f2ec76b05 (patch) | |
| tree | 385e0e13abda1024fc6a5cd8a81583a3a86366bd /src/backend/utils/misc/postgresql.conf.sample | |
| parent | fc3459d70c5d842fe6519522649c8a47454f25bb (diff) | |
| download | postgresql-240067b3b0ff989d2b28f4f917f7958f2ec76b05.tar.gz postgresql-240067b3b0ff989d2b28f4f917f7958f2ec76b05.zip | |
Merge synchronous_replication setting into synchronous_commit.
This means one less thing to configure when setting up synchronous
replication, and also avoids some ambiguity around what the behavior
should be when the settings of these variables conflict.
Fujii Masao, with additional hacking by me.
Diffstat (limited to 'src/backend/utils/misc/postgresql.conf.sample')
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 43481859993..b8a1582eaa9 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -153,7 +153,7 @@ #wal_level = minimal # minimal, archive, or hot_standby # (change requires restart) #fsync = on # turns forced synchronization on or off -#synchronous_commit = on # immediate fsync at commit +#synchronous_commit = on # synchronization level; on, off, or local #wal_sync_method = fsync # the default is the first option # supported by the operating system: # open_datasync @@ -184,10 +184,6 @@ #archive_timeout = 0 # force a logfile segment switch after this # number of seconds; 0 disables -# - Replication - User Settings - -#synchronous_replication = off # does commit wait for reply from standby - # - Streaming Replication - Server Settings #synchronous_standby_names = '' # standby servers that provide sync rep |