pgpool2.git / summary / log / commit / refs
commit a714980071bf30c8144495c859bb08d62e5375c1
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Mon Jul 14 09:40:48 2014 +0000
Change default value of connect_timeout from 1 second to 10 seconds.
Now that stable branches use fixed 10 seconds timeout, master branch's
default should use the same value for consistency sake.
doc/pgpool-en.html | 2 +-
doc/pgpool-ja.html | 2 +-
src/config/pool_config.c | 2 +-
src/config/pool_config.l | 2 +-
src/sample/pgpool.conf.sample | 4 ++--
src/sample/pgpool.conf.sample-master-slave | 4 ++--
src/sample/pgpool.conf.sample-replication | 4 ++--
src/sample/pgpool.conf.sample-stream | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/pgpool-en.html b/doc/pgpool-en.html
index 0f893b987..5d1852c92 100644
--- a/doc/pgpool-en.html
+++ b/doc/pgpool-en.html
@@ -1020,7 +1020,7 @@ local0.* /var/log/pgpool.log
<dt><a name="CONNECT_TIMEOUT"></a>connect_timeout <span class="version">V3.4 -</span></dt>
<dd>
<p>Timeout value in milliseconds before giving up connecting to
- backend using connect() system call. Default is 1000 ms (1
+ backend using connect() system call. Default is 10000 ms (10
second). Flaky network user may want to increase the value. 0
means no timeout. Note that this value is not only used for
health check, but also for creating ordinary conection pools.
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index 410abd139..6b5ffe82e 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -1014,7 +1014,7 @@ local0.* /var/log/pgpool.log
<dt><a name="CONNECT_TIMEOUT"></a>connect_timeout <span class="version">V3.4 -</span></dt>
<dd>
<p>connect()システムコールを使ってバックエンドに接続する際のタイムアウト値をミリ秒単位で指定します。
- デフォルトは1000ミリ秒(1秒)です。不安定なネットワークを使わなければならない場合は、この値を大きくすると良いでしょう。
+ デフォルトは10000ミリ秒(10秒)です。不安定なネットワークを使わなければならない場合は、この値を大きくすると良いでしょう。
0を指定すると、タイムアウトしません。
</p>
<p>
diff --git a/src/config/pool_config.c b/src/config/pool_config.c
index 1eb0591b1..4dd15f110 100644
--- a/src/config/pool_config.c
+++ b/src/config/pool_config.c
@@ -1934,7 +1934,7 @@ int pool_init_config(void)
pool_config->health_check_password = "";
pool_config->health_check_max_retries = 0;
pool_config->health_check_retry_delay = 1;
- pool_config->connect_timeout = 1000;
+ pool_config->connect_timeout = 10000;
pool_config->sr_check_period = 0;
pool_config->sr_check_user = "nobody";
pool_config->sr_check_password = "";
diff --git a/src/config/pool_config.l b/src/config/pool_config.l
index 6f962d6f4..c45657194 100644
--- a/src/config/pool_config.l
+++ b/src/config/pool_config.l
@@ -195,7 +195,7 @@ int pool_init_config(void)
pool_config->health_check_password = "";
pool_config->health_check_max_retries = 0;
pool_config->health_check_retry_delay = 1;
- pool_config->connect_timeout = 1000;
+ pool_config->connect_timeout = 10000;
pool_config->sr_check_period = 0;
pool_config->sr_check_user = "nobody";
pool_config->sr_check_password = "";
diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index 9c8e845ed..9b9b93acb 100644
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -391,9 +391,9 @@ health_check_max_retries = 0
# Maximum number of times to retry a failed health check before giving up.
health_check_retry_delay = 1
# Amount of time to wait (in seconds) between retries.
-connect_timeout = 1000
+connect_timeout = 10000
# Timeout value in milliseconds before giving up to connect to backend.
- # Default is 1000 ms (1 second). Flaky network user may want to increase
+ # Default is 10000 ms (10 second). Flaky network user may want to increase
# the value. 0 means no timeout.
# Note that this value is not only used for health check,
# but also for ordinary conection to backend.
diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index 3c7be68e8..273fd521a 100644
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -390,9 +390,9 @@ health_check_max_retries = 0
# Maximum number of times to retry a failed health check before giving up.
health_check_retry_delay = 1
# Amount of time to wait (in seconds) between retries.
-connect_timeout = 1000
+connect_timeout = 10000
# Timeout value in milliseconds before giving up to connect to backend.
- # Default is 1000 ms (1 second). Flaky network user may want to increase
+ # Default is 10000 ms (10 second). Flaky network user may want to increase
# the value. 0 means no timeout.
# Note that this value is not only used for health check,
# but also for ordinary conection to backend.
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index 73a4c4c69..b1f91f66b 100644
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -390,9 +390,9 @@ health_check_max_retries = 0
# Maximum number of times to retry a failed health check before giving up.
health_check_retry_delay = 1
# Amount of time to wait (in seconds) between retries.
-connect_timeout = 1000
+connect_timeout = 10000
# Timeout value in milliseconds before giving up to connect to backend.
- # Default is 1000 ms (1 second). Flaky network user may want to increase
+ # Default is 10000 ms (10 second). Flaky network user may want to increase
# the value. 0 means no timeout.
# Note that this value is not only used for health check,
# but also for ordinary conection to backend.
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index fa6551f8f..3d7e167ad 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -391,9 +391,9 @@ health_check_max_retries = 0
# Maximum number of times to retry a failed health check before giving up.
health_check_retry_delay = 1
# Amount of time to wait (in seconds) between retries.
-connect_timeout = 1000
+connect_timeout = 10000
# Timeout value in milliseconds before giving up to connect to backend.
- # Default is 1000 ms (1 second). Flaky network user may want to increase
+ # Default is 10000 ms (10 second). Flaky network user may want to increase
# the value. 0 means no timeout.
# Note that this value is not only used for health check,
# but also for ordinary conection to backend.
[parent: b7209285a8d9]