Commit 4bd8ed31 authored by Simon Riggs's avatar Simon Riggs

Introduce sending servers as new category for replication params

Fujii Masao
parent 6307fff3
...@@ -557,6 +557,8 @@ const char *const config_group_names[] = ...@@ -557,6 +557,8 @@ const char *const config_group_names[] =
gettext_noop("Write-Ahead Log / Archiving"), gettext_noop("Write-Ahead Log / Archiving"),
/* REPLICATION */ /* REPLICATION */
gettext_noop("Replication"), gettext_noop("Replication"),
/* REPLICATION_SENDING */
gettext_noop("Replication / Sending Servers"),
/* REPLICATION_MASTER */ /* REPLICATION_MASTER */
gettext_noop("Replication / Master Server"), gettext_noop("Replication / Master Server"),
/* REPLICATION_STANDBY */ /* REPLICATION_STANDBY */
...@@ -1918,7 +1920,7 @@ static struct config_int ConfigureNamesInt[] = ...@@ -1918,7 +1920,7 @@ static struct config_int ConfigureNamesInt[] =
}, },
{ {
{"wal_keep_segments", PGC_SIGHUP, REPLICATION_MASTER, {"wal_keep_segments", PGC_SIGHUP, REPLICATION_SENDING,
gettext_noop("Sets the number of WAL files held for standby servers."), gettext_noop("Sets the number of WAL files held for standby servers."),
NULL NULL
}, },
...@@ -1986,7 +1988,7 @@ static struct config_int ConfigureNamesInt[] = ...@@ -1986,7 +1988,7 @@ static struct config_int ConfigureNamesInt[] =
{ {
/* see max_connections */ /* see max_connections */
{"max_wal_senders", PGC_POSTMASTER, REPLICATION_MASTER, {"max_wal_senders", PGC_POSTMASTER, REPLICATION_SENDING,
gettext_noop("Sets the maximum number of simultaneously running WAL sender processes."), gettext_noop("Sets the maximum number of simultaneously running WAL sender processes."),
NULL NULL
}, },
...@@ -1996,7 +1998,7 @@ static struct config_int ConfigureNamesInt[] = ...@@ -1996,7 +1998,7 @@ static struct config_int ConfigureNamesInt[] =
}, },
{ {
{"wal_sender_delay", PGC_SIGHUP, REPLICATION_MASTER, {"wal_sender_delay", PGC_SIGHUP, REPLICATION_SENDING,
gettext_noop("WAL sender sleep time between WAL replications."), gettext_noop("WAL sender sleep time between WAL replications."),
NULL, NULL,
GUC_UNIT_MS GUC_UNIT_MS
...@@ -2007,7 +2009,7 @@ static struct config_int ConfigureNamesInt[] = ...@@ -2007,7 +2009,7 @@ static struct config_int ConfigureNamesInt[] =
}, },
{ {
{"replication_timeout", PGC_SIGHUP, REPLICATION_MASTER, {"replication_timeout", PGC_SIGHUP, REPLICATION_SENDING,
gettext_noop("Sets the maximum time to wait for WAL replication."), gettext_noop("Sets the maximum time to wait for WAL replication."),
NULL, NULL,
GUC_UNIT_MS GUC_UNIT_MS
......
...@@ -194,19 +194,24 @@ ...@@ -194,19 +194,24 @@
# REPLICATION # REPLICATION
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# - Master Server - # - Sending Server(s) -
# These settings are ignored on a standby server # Set these on the master and on any standby that will send replication data
#max_wal_senders = 0 # max number of walsender processes #max_wal_senders = 0 # max number of walsender processes
# (change requires restart) # (change requires restart)
#wal_sender_delay = 1s # walsender cycle time, 1-10000 milliseconds #wal_sender_delay = 1s # walsender cycle time, 1-10000 milliseconds
#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables #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 disables #replication_timeout = 60s # in milliseconds; 0 disables
# - Master Server -
# These settings are ignored on a standby server
#synchronous_standby_names = '' # standby servers that provide sync rep #synchronous_standby_names = '' # standby servers that provide sync rep
# comma-separated list of application_name # comma-separated list of application_name
# from standby(s); '*' = all # from standby(s); '*' = all
#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed
# - Standby Servers - # - Standby Servers -
......
...@@ -69,6 +69,7 @@ enum config_group ...@@ -69,6 +69,7 @@ enum config_group
WAL_CHECKPOINTS, WAL_CHECKPOINTS,
WAL_ARCHIVING, WAL_ARCHIVING,
REPLICATION, REPLICATION,
REPLICATION_SENDING,
REPLICATION_MASTER, REPLICATION_MASTER,
REPLICATION_STANDBY, REPLICATION_STANDBY,
QUERY_TUNING, QUERY_TUNING,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment