pgpool2.git / summary / log / commit / refs
commit 717f95f2e3cda98105cba9680fb7b5e4cd55a138
Author: Bo Peng <pengbo@sraoss.co.jp>
Date: Wed Aug 12 07:45:27 2020 +0000
Remove some unnecessary settings from sample config files.
src/sample/pgpool.conf.sample-logical | 4 +---
src/sample/pgpool.conf.sample-raw | 5 +++++
src/sample/pgpool.conf.sample-replication | 10 +---------
src/sample/pgpool.conf.sample-slony | 8 +++++---
src/sample/pgpool.conf.sample-snapshot | 10 +---------
src/sample/pgpool.conf.sample-stream | 8 +++++---
6 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index a77136675..a81fdb01b 100644
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -22,6 +22,7 @@
# Choose one of: 'streaming_replication', 'native_replication',
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'logical_replication'
#------------------------------------------------------------------------------
@@ -314,9 +315,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
# REPLICATION MODE
#------------------------------------------------------------------------------
-replication_mode = off
- # Activate replication mode
- # (change requires restart)
replicate_select = off
# Replicate SELECT statements
# when in replication mode
diff --git a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
index 36d04509b..023984f61 100644
--- a/src/sample/pgpool.conf.sample-raw
+++ b/src/sample/pgpool.conf.sample-raw
@@ -23,6 +23,7 @@
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
# (change requires restart)
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'raw'
#------------------------------------------------------------------------------
@@ -433,6 +434,10 @@ dml_adaptive_object_relationship_list= ''
statement_level_load_balance = off
# Enables statement level load balancing
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
# - Streaming -
sr_check_period = 10
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index dcae99d94..7338f92b9 100644
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -23,6 +23,7 @@
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
# (change requires restart)
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'native_replication'
#------------------------------------------------------------------------------
@@ -432,15 +433,6 @@ statement_level_load_balance = off
# MASTER/SLAVE MODE
#------------------------------------------------------------------------------
-master_slave_mode = off
- # Activate master/slave mode
- # (change requires restart)
-master_slave_sub_mode = 'stream'
- # Master/slave sub mode
- # Valid values are combinations stream, slony
- # or logical. Default is stream.
- # (change requires restart)
-
# - Streaming -
sr_check_period = 0
diff --git a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
index 3a78e6504..f1bef59a0 100644
--- a/src/sample/pgpool.conf.sample-slony
+++ b/src/sample/pgpool.conf.sample-slony
@@ -23,6 +23,7 @@
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
# (change requires restart)
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'slony'
#------------------------------------------------------------------------------
@@ -311,9 +312,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
# REPLICATION MODE
#------------------------------------------------------------------------------
-replication_mode = off
- # Activate replication mode
- # (change requires restart)
replicate_select = off
# Replicate SELECT statements
# when in replication mode
@@ -432,6 +430,10 @@ dml_adaptive_object_relationship_list= ''
statement_level_load_balance = off
# Enables statement level load balancing
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
# - Streaming -
sr_check_period = 0
diff --git a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
index d55cc32b4..16a12d106 100644
--- a/src/sample/pgpool.conf.sample-snapshot
+++ b/src/sample/pgpool.conf.sample-snapshot
@@ -23,6 +23,7 @@
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
# (change requires restart)
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'snapshot_isolation'
#------------------------------------------------------------------------------
@@ -432,15 +433,6 @@ statement_level_load_balance = off
# MASTER/SLAVE MODE
#------------------------------------------------------------------------------
-master_slave_mode = off
- # Activate master/slave mode
- # (change requires restart)
-master_slave_sub_mode = 'stream'
- # Master/slave sub mode
- # Valid values are combinations stream, slony
- # or logical. Default is stream.
- # (change requires restart)
-
# - Streaming -
sr_check_period = 0
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 8f59d03b5..921fa6c10 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -23,6 +23,7 @@
# 'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
# (change requires restart)
#------------------------------------------------------------------------------
+
backend_clustering_mode = 'streaming_replication'
#------------------------------------------------------------------------------
@@ -314,9 +315,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
# REPLICATION MODE
#------------------------------------------------------------------------------
-replication_mode = off
- # Activate replication mode
- # (change requires restart)
replicate_select = off
# Replicate SELECT statements
# when in replication mode
@@ -435,6 +433,10 @@ dml_adaptive_object_relationship_list= ''
statement_level_load_balance = off
# Enables statement level load balancing
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
# - Streaming -
sr_check_period = 10
[parent: a8e6fbb887ad]