pgpool2.git / summary / log / commit / refs
commit a01fe35acbbea02eb994240e0a7d3996b51ec89c
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Wed Sep 23 09:33:04 2020 +0000
More language cleanup.
Patch contributed by Umar Hayat.
doc.ja/src/sgml/failover.sgml | 2 +-
doc.ja/src/sgml/ref/wd_cli.sgml | 2 +-
doc/src/sgml/failover.sgml | 2 +-
doc/src/sgml/ref/wd_cli.sgml | 2 +-
src/include/pcp/pcp.h | 2 +-
src/include/pcp/pcp_stream.h | 2 +-
src/include/pool.h | 2 +-
src/include/utils/pool_signal.h | 2 +-
src/include/utils/timestamp.h | 2 +-
src/test/regression/tests/004.watchdog/master.conf | 18 ----------------
.../tests/011.watchdog_quorum_failover/master.conf | 21 ------------------
.../master.conf | 25 ----------------------
.../master.conf | 25 ----------------------
.../014.watchdog_test_quorum_bypass/master.conf | 25 ----------------------
.../master.conf | 25 ----------------------
15 files changed, 9 insertions(+), 148 deletions(-)
diff --git a/doc.ja/src/sgml/failover.sgml b/doc.ja/src/sgml/failover.sgml
index f839d2b30..d470a9a90 100644
--- a/doc.ja/src/sgml/failover.sgml
+++ b/doc.ja/src/sgml/failover.sgml
@@ -461,7 +461,7 @@
command will not be executed. This command also runs if a
node promote request is issued by
<xref linkend="PCP-PROMOTE-NODE"> command. This works only
- in Master Replication mode with streaming replication.
+ in streaming replication mode.
-->
プライマリノードのフェイルオーバー後に実行するユーザコマンドを指定します。
スタンバイがフェイルオーバーした際にはこのコマンドは実行されません。
diff --git a/doc.ja/src/sgml/ref/wd_cli.sgml b/doc.ja/src/sgml/ref/wd_cli.sgml
index 3cc6902ba..c7d8a18b7 100644
--- a/doc.ja/src/sgml/ref/wd_cli.sgml
+++ b/doc.ja/src/sgml/ref/wd_cli.sgml
@@ -344,7 +344,7 @@ watchdog IPCソケットのポート番号です。
*****************
Node ID: 0
Node Status code 4
- Node Status: MASTER
+ Node Status: LEADER
Node Name: localhost:9991 Linux localhost.localdomain
Node Host: localhost
Node WD Port: 9001
diff --git a/doc/src/sgml/failover.sgml b/doc/src/sgml/failover.sgml
index 004d765fb..1225a5ef7 100644
--- a/doc/src/sgml/failover.sgml
+++ b/doc/src/sgml/failover.sgml
@@ -373,7 +373,7 @@
command will not be executed. This command also runs if a
node promote request is issued by
<xref linkend="PCP-PROMOTE-NODE"> command. This works only
- in Replication mode with streaming replication.
+ in streaming replication mode.
</para>
<para>
diff --git a/doc/src/sgml/ref/wd_cli.sgml b/doc/src/sgml/ref/wd_cli.sgml
index 5442e2492..7944dfd04 100644
--- a/doc/src/sgml/ref/wd_cli.sgml
+++ b/doc/src/sgml/ref/wd_cli.sgml
@@ -264,7 +264,7 @@ Pgpool-II documentation
*****************
Node ID: 0
Node Status code 4
- Node Status: MASTER
+ Node Status: LEADER
Node Name: localhost:9991 Linux localhost.localdomain
Node Host: localhost
Node WD Port: 9001
diff --git a/src/include/pcp/pcp.h b/src/include/pcp/pcp.h
index aa7bd89c4..d4fd8832c 100644
--- a/src/include/pcp/pcp.h
+++ b/src/include/pcp/pcp.h
@@ -18,7 +18,7 @@
* is" without express or implied warranty.
*
*
- * pcp.h - master header file.
+ * pcp.h - pcp header file.
*/
#ifndef PCP_H
diff --git a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
index a0d41a77c..b718b64fd 100644
--- a/src/include/pcp/pcp_stream.h
+++ b/src/include/pcp/pcp_stream.h
@@ -17,7 +17,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * pcp_stream.h - master header file.
+ * pcp_stream.h - pcp_stream header file.
*/
#ifndef PCP_STREAM_H
diff --git a/src/include/pool.h b/src/include/pool.h
index b30e65b92..d1c1fd66c 100644
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -17,7 +17,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * pool.h.: master definition header file
+ * pool.h.: pool definition header file
*
*/
diff --git a/src/include/utils/pool_signal.h b/src/include/utils/pool_signal.h
index bc9a0f641..ddaf76010 100644
--- a/src/include/utils/pool_signal.h
+++ b/src/include/utils/pool_signal.h
@@ -20,7 +20,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * pool.h.: master definition header file
+ * pool_signal.h.: pool_signal definition header file
*
*/
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 78e65c46c..d526bfc66 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -16,7 +16,7 @@
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
- * ppgool_logger.h.: master definition header file
+ * ppgool_logger.h.: ppgool_logger definition header file
*
*/
/*-------------------------------------------------------------------------
diff --git a/src/test/regression/tests/004.watchdog/master.conf b/src/test/regression/tests/004.watchdog/master.conf
deleted file mode 100644
index a1d1464a4..000000000
--- a/src/test/regression/tests/004.watchdog/master.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# master watchdog
-use_watchdog = on
-wd_interval = 1
-wd_priority = 2
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port0 = 11100
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port01 = 21105
-
-enable_consensus_with_half_votes = on
diff --git a/src/test/regression/tests/011.watchdog_quorum_failover/master.conf b/src/test/regression/tests/011.watchdog_quorum_failover/master.conf
deleted file mode 100644
index a7d78c4f6..000000000
--- a/src/test/regression/tests/011.watchdog_quorum_failover/master.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# master watchdog
-use_watchdog = on
-wd_interval = 1
-wd_priority = 5
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port1 = 11100
-hostname2 = 'localhost'
-wd_port2 = 21204
-pgpool_port2 = 11200
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port1 = 21105
-heartbeat_hostname2 = 'localhost'
-heartbeat_port2 = 21205
diff --git a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/master.conf b/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/master.conf
deleted file mode 100644
index 37efa3d69..000000000
--- a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/master.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# master watchdog
-num_init_children = 4
-use_watchdog = on
-failover_when_quorum_exists = true
-failover_require_consensus = false
-allow_multiple_failover_requests_from_node = false
-wd_interval = 1
-wd_priority = 5
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port1 = 11100
-hostname2 = 'localhost'
-wd_port2 = 21204
-pgpool_port2 = 11200
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port1 = 21105
-heartbeat_hostname2 = 'localhost'
-heartbeat_port2 = 21205
diff --git a/src/test/regression/tests/013.watchdog_failover_require_consensus/master.conf b/src/test/regression/tests/013.watchdog_failover_require_consensus/master.conf
deleted file mode 100644
index d8af08b49..000000000
--- a/src/test/regression/tests/013.watchdog_failover_require_consensus/master.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# master watchdog
-num_init_children = 4
-use_watchdog = on
-failover_when_quorum_exists = true
-failover_require_consensus = true
-allow_multiple_failover_requests_from_node = false
-wd_interval = 1
-wd_priority = 5
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port1 = 11100
-hostname2 = 'localhost'
-wd_port2 = 21204
-pgpool_port2 = 11200
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port1 = 21105
-heartbeat_hostname2 = 'localhost'
-heartbeat_port2 = 21205
diff --git a/src/test/regression/tests/014.watchdog_test_quorum_bypass/master.conf b/src/test/regression/tests/014.watchdog_test_quorum_bypass/master.conf
deleted file mode 100644
index d8af08b49..000000000
--- a/src/test/regression/tests/014.watchdog_test_quorum_bypass/master.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# master watchdog
-num_init_children = 4
-use_watchdog = on
-failover_when_quorum_exists = true
-failover_require_consensus = true
-allow_multiple_failover_requests_from_node = false
-wd_interval = 1
-wd_priority = 5
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port1 = 11100
-hostname2 = 'localhost'
-wd_port2 = 21204
-pgpool_port2 = 11200
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port1 = 21105
-heartbeat_hostname2 = 'localhost'
-heartbeat_port2 = 21205
diff --git a/src/test/regression/tests/015.watchdog_master_and_backend_fail/master.conf b/src/test/regression/tests/015.watchdog_master_and_backend_fail/master.conf
deleted file mode 100644
index d8af08b49..000000000
--- a/src/test/regression/tests/015.watchdog_master_and_backend_fail/master.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# master watchdog
-num_init_children = 4
-use_watchdog = on
-failover_when_quorum_exists = true
-failover_require_consensus = true
-allow_multiple_failover_requests_from_node = false
-wd_interval = 1
-wd_priority = 5
-
-hostname0 = 'localhost'
-wd_port0 = 21004
-pgpool_port0 = 11000
-hostname1 = 'localhost'
-wd_port1 = 21104
-pgpool_port1 = 11100
-hostname2 = 'localhost'
-wd_port2 = 21204
-pgpool_port2 = 11200
-
-heartbeat_hostname0 = 'localhost'
-heartbeat_port0 = 21005
-heartbeat_hostname1 = 'localhost'
-heartbeat_port1 = 21105
-heartbeat_hostname2 = 'localhost'
-heartbeat_port2 = 21205
[parent: e9ad137732f4]