aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFujii Masao <fujii@postgresql.org>2017-04-12 00:10:54 +0900
committerFujii Masao <fujii@postgresql.org>2017-04-12 00:10:54 +0900
commitff7bce174390ae063c122ab04020bd4ee070d6ad (patch)
tree12fdc01bc99123086e3693049174dcebd4a06f8b
parent1c1a4726eba5bb8c0772db8a8efe0315d71887fb (diff)
downloadpostgresql-ff7bce174390ae063c122ab04020bd4ee070d6ad.tar.gz
postgresql-ff7bce174390ae063c122ab04020bd4ee070d6ad.zip
Add max_sync_workers_per_subscription to postgresql.conf.sample.
This commit also does - add REPLICATION_SUBSCRIBERS into config_group - mark max_logical_replication_workers and max_sync_workers_per_subscription as REPLICATION_SUBSCRIBERS parameters - move those parameters into "Subscribers" section in postgresql.conf.sample Author: Masahiko Sawada, Petr Jelinek and me Reported-by: Masahiko Sawada Discussion: http://postgr.es/m/CAD21AoAonSCoa=v=87ZO3vhfUZA1k_E2XRNHTt=xioWGUa+0ug@mail.gmail.com
-rw-r--r--src/backend/utils/misc/guc.c6
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample8
-rw-r--r--src/include/utils/guc_tables.h1
3 files changed, 12 insertions, 3 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index cdab76f81b0..6e39a676094 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -610,6 +610,8 @@ const char *const config_group_names[] =
gettext_noop("Replication / Master Server"),
/* REPLICATION_STANDBY */
gettext_noop("Replication / Standby Servers"),
+ /* REPLICATION_SUBSCRIBERS */
+ gettext_noop("Replication / Subscribers"),
/* QUERY_TUNING */
gettext_noop("Query Tuning"),
/* QUERY_TUNING_METHOD */
@@ -2511,7 +2513,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_logical_replication_workers",
PGC_POSTMASTER,
- RESOURCES_ASYNCHRONOUS,
+ REPLICATION_SUBSCRIBERS,
gettext_noop("Maximum number of logical replication worker processes."),
NULL,
},
@@ -2523,7 +2525,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_sync_workers_per_subscription",
PGC_SIGHUP,
- RESOURCES_ASYNCHRONOUS,
+ REPLICATION_SUBSCRIBERS,
gettext_noop("Maximum number of table synchronization workers per subscription."),
NULL,
},
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 512be0a92ed..1435d923df3 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -164,7 +164,6 @@
#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers
#max_parallel_workers = 8 # maximum number of max_worker_processes that
# can be used in parallel queries
-#max_logical_replication_workers = 4 # taken from max_worker_processes
#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate
# (change requires restart)
#backend_flush_after = 0 # measured in pages, 0 disables
@@ -273,6 +272,13 @@
#wal_retrieve_retry_interval = 5s # time to wait before retrying to
# retrieve WAL after a failed attempt
+# - Subscribers -
+
+# These settings are ignored on a publisher.
+
+#max_logical_replication_workers = 4 # taken from max_worker_processes
+#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers
+
#------------------------------------------------------------------------------
# QUERY TUNING
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 2da91154294..91c6000ec6a 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -72,6 +72,7 @@ enum config_group
REPLICATION_SENDING,
REPLICATION_MASTER,
REPLICATION_STANDBY,
+ REPLICATION_SUBSCRIBERS,
QUERY_TUNING,
QUERY_TUNING_METHOD,
QUERY_TUNING_COST,