From 240067b3b0ff989d2b28f4f917f7958f2ec76b05 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Mon, 4 Apr 2011 16:13:01 -0400 Subject: 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. --- src/backend/utils/misc/postgresql.conf.sample | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/backend/utils/misc/postgresql.conf.sample') 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 -- cgit v1.2.3