pgpool2.git / summary / log / commit / refs
commit fdb74e62323b52b62b17f3b669b057bc062bfcca
Author: at.mitani <at.mitani@gmail.com>
Date: Sat Jun 09 11:15:44 2012 +0000
modified pgpool.conf.sample
main.c | 2 +-
pgpool.conf.sample | 50 +++++++++++++++++++++++++-------------------------
pool_config.c | 4 ++--
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/main.c b/main.c
index 08af962c7..008869f9b 100644
--- a/main.c
+++ b/main.c
@@ -997,7 +997,7 @@ static void write_pid_file(void)
}
snprintf(pidbuf, sizeof(pidbuf), "%d", (int)getpid());
fwrite(pidbuf, strlen(pidbuf)+1, 1, fd);
- fflush(fd);
+ fsync(fd);
if (fclose(fd))
{
pool_error("could not write pid file as %s. reason: %s",
diff --git a/pgpool.conf.sample b/pgpool.conf.sample
index d6f1a9eb4..024c7d2af 100644
--- a/pgpool.conf.sample
+++ b/pgpool.conf.sample
@@ -302,8 +302,8 @@ follow_master_command = ''
# %H = hostname of the new master node
# %M = old master node id
# %P = old primary node id
- # %r = new master port number
- # %R = new master database cluster path
+ # %r = new master port number
+ # %R = new master database cluster path
# %% = '%' character
@@ -369,8 +369,8 @@ failover_command = ''
# %H = hostname of the new master node
# %M = old master node id
# %P = old primary node id
- # %r = new master port number
- # %R = new master database cluster path
+ # %r = new master port number
+ # %R = new master database cluster path
# %% = '%' character
failback_command = ''
# Executes this command at failback.
@@ -383,8 +383,8 @@ failback_command = ''
# %H = hostname of the new master node
# %M = old master node id
# %P = old primary node id
- # %r = new master port number
- # %R = new master database cluster path
+ # %r = new master port number
+ # %R = new master database cluster path
# %% = '%' character
fail_over_on_backend_error = on
@@ -424,27 +424,27 @@ client_idle_limit_in_recovery = 0
use_watchdog = on
# Activates watchdog
trusted_servers = ''
- # trusted server list which are used
- # to confirm network connection
- # (hostA,hostB,hostC,...)
+ # trusted server list which are used
+ # to confirm network connection
+ # (hostA,hostB,hostC,...)
delegate_IP = ''
- # delegate IP address
+ # delegate IP address
wd_port = 9000
- # port number for watchdog service
-wd_interval = 10;
- # lifecheck interval (sec) > 0
+ # port number for watchdog service
+wd_interval = 10
+ # lifecheck interval (sec) > 0
ping_path = '/bin'
- # ping command path
+ # ping command path
ifconfig_path = '/sbin'
- # ifconfig command path
+ # ifconfig command path
if_up_cmd = 'ifconfig eth0:0 inet $_IP_$ netmask 255.255.255.0'
- # startup delegate IP command
+ # startup delegate IP command
if_down_cmd = 'ifconfig eth0:0 down'
- # shutdown delegate IP command
+ # shutdown delegate IP command
wd_life_point = 3
- # lifecheck retry times
+ # lifecheck retry times
wd_lifecheck_query = 'SELECT 1'
- # lifecheck query to pgpool from watchdog
+ # lifecheck query to pgpool from watchdog
# Other pgpool Connection Settings
#other_pgpool_hostname0 = 'host0'
@@ -479,16 +479,16 @@ relcache_expire = 0
relcache_size = 256
# Number of relation cache
# entry. If you see frequently:
- # "pool_search_relcache: cache replacement happend"
- # in the pgpool log, you might want to increate this number.
+ # "pool_search_relcache: cache replacement happend"
+ # in the pgpool log, you might want to increate this number.
check_temp_table = on
# If on, enable temporary table check in SELECT statements.
# This initiates queries against system catalog of primary/master
- # thus increases load of master.
- # If you are absolutely sure that your system never uses temporary tables
- # and you want to save access to primary/master, you could turn this off.
- # Default is on.
+ # thus increases load of master.
+ # If you are absolutely sure that your system never uses temporary tables
+ # and you want to save access to primary/master, you could turn this off.
+ # Default is on.
#------------------------------------------------------------------------------
diff --git a/pool_config.c b/pool_config.c
index 0963e243f..dc20ad769 100644
--- a/pool_config.c
+++ b/pool_config.c
@@ -3643,7 +3643,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
WD_INFO(slot).pgpool_port = atoi(yytext);
}
- else if (!strncmp(key, "other_pgpool_wd_port", 20) &&
+ else if (!strncmp(key, "other_wd_port", 13) &&
CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context) &&
mypid == getpid()) /* this parameter must be modified by parent pid */
{
@@ -3652,7 +3652,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
slot = atoi(key + 20);
if (slot < 0 || slot >= MAX_CONNECTION_SLOTS)
{
- pool_error("pool_config: pgpool number %s for other_pgpool_wd_port out of range", key);
+ pool_error("pool_config: pgpool number %s for other_wd_port out of range", key);
fclose(fd);
return(-1);
}
[parent: 6ee072bd88f0]