pgpool2.git / summary / log / commit / refs
commit f0418bdb2557e8cb990178273286bc23c1b8d5a2
Author: Bo Peng <pengbo@sraoss.co.jp>
Date: Mon Feb 12 14:41:04 2018 +0000
Fix typos.
doc.ja/src/sgml/ref/watchdog_setup.sgml | 8 ++++----
doc/src/sgml/examples.sgml | 6 +++---
doc/src/sgml/ref/watchdog_setup.sgml | 8 ++++----
src/sample/pgpool.conf.sample | 4 ++--
src/sample/pgpool.conf.sample-logical | 4 ++--
src/sample/pgpool.conf.sample-master-slave | 4 ++--
src/sample/pgpool.conf.sample-replication | 4 ++--
src/sample/pgpool.conf.sample-stream | 4 ++--
src/test/pgpool_setup | 2 +-
src/watchdog/watchdog.c | 8 ++++----
10 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/doc.ja/src/sgml/ref/watchdog_setup.sgml b/doc.ja/src/sgml/ref/watchdog_setup.sgml
index 7db540ba3..63f450b78 100644
--- a/doc.ja/src/sgml/ref/watchdog_setup.sgml
+++ b/doc.ja/src/sgml/ref/watchdog_setup.sgml
@@ -369,12 +369,12 @@ Satrting set up in streaming replication mode
creating startall and shutdownall
creating failover script
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool1/data0...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool1/data1...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
@@ -414,12 +414,12 @@ Satrting set up in streaming replication mode
creating startall and shutdownall
creating failover script
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool2/data0...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool2/data1...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
diff --git a/doc/src/sgml/examples.sgml b/doc/src/sgml/examples.sgml
index 002ed1693..3ff48ffaa 100644
--- a/doc/src/sgml/examples.sgml
+++ b/doc/src/sgml/examples.sgml
@@ -530,7 +530,7 @@ LOG: watchdog remote node:0 on Linux_osspc16_9000:9000
LOG: interface monitoring is disabled in watchdog
LOG: IPC socket path: "/tmp/.s.PGPOOLWD_CMD.9000"
LOG: watchdog node state changed from [DEAD] to [LOADING]
-LOG: new outbond connection to Linux_osspc16_9000:9000
+LOG: new outbound connection to Linux_osspc16_9000:9000
LOG: watchdog node state changed from [LOADING] to [INITIALIZING]
LOG: watchdog node state changed from [INITIALIZING] to [STANDBY]
<emphasis>
@@ -597,7 +597,7 @@ LOG: watchdog cluster has lost the coordinator node
LOG: watchdog node state changed from [STANDBY] to [JOINING]
LOG: watchdog node state changed from [JOINING] to [INITIALIZING]
LOG: I am the only alive node in the watchdog cluster
-HINT: skiping stand for coordinator state
+HINT: skipping stand for coordinator state
LOG: watchdog node state changed from [INITIALIZING] to [MASTER]
LOG: I am announcing my self as master/coordinator watchdog node
LOG: I am the cluster leader node
@@ -1810,7 +1810,7 @@ LOG: watchdog cluster has lost the coordinator node
LOG: watchdog node state changed from [STANDBY] to [JOINING]
LOG: watchdog node state changed from [JOINING] to [INITIALIZING]
LOG: I am the only alive node in the watchdog cluster
-HINT: skiping stand for coordinator state
+HINT: skipping stand for coordinator state
LOG: watchdog node state changed from [INITIALIZING] to [MASTER]
LOG: I am announcing my self as master/coordinator watchdog node
LOG: I am the cluster leader node
diff --git a/doc/src/sgml/ref/watchdog_setup.sgml b/doc/src/sgml/ref/watchdog_setup.sgml
index 7886003c1..7a9b91f27 100644
--- a/doc/src/sgml/ref/watchdog_setup.sgml
+++ b/doc/src/sgml/ref/watchdog_setup.sgml
@@ -274,12 +274,12 @@ Satrting set up in streaming replication mode
creating startall and shutdownall
creating failover script
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool1/data0...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool1/data1...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
@@ -319,12 +319,12 @@ Satrting set up in streaming replication mode
creating startall and shutdownall
creating failover script
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool2/data0...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
creating database cluster /home/t-ishii/work/pgpool-II/current/pgpool2/src/test/a/pgpool2/data1...done.
-update postgreql.conf
+update postgresql.conf
creating pgpool_remote_start
creating basebackup.sh
creating recovery.conf
diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index 6876f3bbd..1c5efc448 100644
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -643,10 +643,10 @@ wd_lifecheck_password = ''
# Host name or IP address to connect to for other pgpool 0
# (change requires restart)
#other_pgpool_port0 = 5432
- # Port number for othet pgpool 0
+ # Port number for other pgpool 0
# (change requires restart)
#other_wd_port0 = 9000
- # Port number for othet watchdog 0
+ # Port number for other watchdog 0
# (change requires restart)
#other_pgpool_hostname1 = 'host1'
#other_pgpool_port1 = 5432
diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index 335260487..7c5f67d04 100644
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -636,10 +636,10 @@ wd_lifecheck_password = ''
# Host name or IP address to connect to for other pgpool 0
# (change requires restart)
#other_pgpool_port0 = 5432
- # Port number for othet pgpool 0
+ # Port number for other pgpool 0
# (change requires restart)
#other_wd_port0 = 9000
- # Port number for othet watchdog 0
+ # Port number for other watchdog 0
# (change requires restart)
#other_pgpool_hostname1 = 'host1'
#other_pgpool_port1 = 5432
diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index 25eb20fe3..4807b4780 100644
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -642,10 +642,10 @@ wd_lifecheck_password = ''
# Host name or IP address to connect to for other pgpool 0
# (change requires restart)
#other_pgpool_port0 = 5432
- # Port number for othet pgpool 0
+ # Port number for other pgpool 0
# (change requires restart)
#other_wd_port0 = 9000
- # Port number for othet watchdog 0
+ # Port number for other watchdog 0
# (change requires restart)
#other_pgpool_hostname1 = 'host1'
#other_pgpool_port1 = 5432
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index e6666d7f2..64d69c36e 100644
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -641,10 +641,10 @@ wd_lifecheck_password = ''
# Host name or IP address to connect to for other pgpool 0
# (change requires restart)
#other_pgpool_port0 = 5432
- # Port number for othet pgpool 0
+ # Port number for other pgpool 0
# (change requires restart)
#other_wd_port0 = 9000
- # Port number for othet watchdog 0
+ # Port number for other watchdog 0
# (change requires restart)
#other_pgpool_hostname1 = 'host1'
#other_pgpool_port1 = 5432
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 0d1baefde..d752b1745 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -642,10 +642,10 @@ wd_lifecheck_password = ''
# Host name or IP address to connect to for other pgpool 0
# (change requires restart)
#other_pgpool_port0 = 5432
- # Port number for othet pgpool 0
+ # Port number for other pgpool 0
# (change requires restart)
#other_wd_port0 = 9000
- # Port number for othet watchdog 0
+ # Port number for other watchdog 0
# (change requires restart)
#other_pgpool_hostname1 = 'host1'
#other_pgpool_port1 = 5432
diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 2638b2f32..4ce2efbc8 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -691,7 +691,7 @@ do
echo "done."
# set postgresql.conf
- echo "update postgreql.conf"
+ echo "update postgresql.conf"
set_postgresql_conf $CLUSTERDIR >&5 2>&1
# create pgpool_remote_start script under cluster directory
diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c
index 52bb2cf52..411e42b4e 100644
--- a/src/watchdog/watchdog.c
+++ b/src/watchdog/watchdog.c
@@ -3057,7 +3057,7 @@ static int update_successful_outgoing_cons(fd_set* wmask, int pending_fds_count)
if (valopt)
{
ereport(DEBUG1,
- (errmsg("error in outbond connection to %s:%d",wdNode->hostname,wdNode->wd_port),
+ (errmsg("error in outbound connection to %s:%d",wdNode->hostname,wdNode->wd_port),
errdetail("%s",strerror(valopt))));
close_socket_connection(&wdNode->client_socket);
wdNode->client_socket.sock_state = WD_SOCK_ERROR;
@@ -3066,7 +3066,7 @@ static int update_successful_outgoing_cons(fd_set* wmask, int pending_fds_count)
{
wdNode->client_socket.sock_state = WD_SOCK_CONNECTED;
ereport(LOG,
- (errmsg("new outbond connection to %s:%d ",wdNode->hostname,wdNode->wd_port)));
+ (errmsg("new outbound connection to %s:%d ",wdNode->hostname,wdNode->wd_port)));
/* set socket to blocking again */
pool_unset_nonblock(wdNode->client_socket.sock);
watchdog_state_machine(WD_EVENT_NEW_OUTBOUND_CONNECTION, wdNode, NULL, NULL);
@@ -3075,7 +3075,7 @@ static int update_successful_outgoing_cons(fd_set* wmask, int pending_fds_count)
else
{
ereport(DEBUG1,
- (errmsg("error in outbond connection to %s:%d ",wdNode->hostname,wdNode->wd_port),
+ (errmsg("error in outbound connection to %s:%d ",wdNode->hostname,wdNode->wd_port),
errdetail("getsockopt faile with error \"%s\"",strerror(errno))));
close_socket_connection(&wdNode->client_socket);
wdNode->client_socket.sock_state = WD_SOCK_ERROR;
@@ -4996,7 +4996,7 @@ static int watchdog_state_machine_initializing(WD_EVENTS event, WatchdogNode* wd
{
ereport(LOG,
(errmsg("I am the only alive node in the watchdog cluster"),
- errhint("skiping stand for coordinator state")));
+ errhint("skipping stand for coordinator state")));
/*
* I am the alone node in the cluster at the moment
[parent: a849fdf8d334]