You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/06/09 19:53:39 UTC
[1/3] trafficserver git commit: TS-3462 Reduce the HostDB lookup
timeout to 30s
Repository: trafficserver
Updated Branches:
refs/heads/master 73b0b4f0d -> e6f28e18f
TS-3462 Reduce the HostDB lookup timeout to 30s
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2c1974cf
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2c1974cf
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2c1974cf
Branch: refs/heads/master
Commit: 2c1974cf162a7303697c3a58415ca8c5929eade4
Parents: 73b0b4f
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jun 8 13:13:38 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jun 9 11:50:43 2015 -0600
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 2 +-
iocore/hostdb/HostDB.cc | 7 ++++---
mgmt/RecordsConfig.cc | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c1974cf/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 451e0e2..c1801b6 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -1756,7 +1756,7 @@ hostname to ``host_x.y.com``.
HostDB
======
-.. ts:cv:: CONFIG proxy.config.hostdb.lookup_timeout INT 120
+.. ts:cv:: CONFIG proxy.config.hostdb.lookup_timeout INT 30
:metric: seconds
:reloadable:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c1974cf/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index a7f5c55..7016f5e 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -46,7 +46,7 @@ int hostdb_enable = true;
int hostdb_migrate_on_demand = true;
int hostdb_cluster = false;
int hostdb_cluster_round_robin = false;
-int hostdb_lookup_timeout = 120;
+int hostdb_lookup_timeout = 30;
int hostdb_insert_timeout = 160;
int hostdb_re_dns_on_reload = false;
int hostdb_ttl_mode = TTL_OBEY;
@@ -1888,10 +1888,11 @@ HostDBContinuation::do_dns()
return;
}
}
- if (hostdb_lookup_timeout)
+ if (hostdb_lookup_timeout) {
timeout = mutex->thread_holding->schedule_in(this, HRTIME_SECONDS(hostdb_lookup_timeout));
- else
+ } else {
timeout = NULL;
+ }
if (set_check_pending_dns()) {
DNSProcessor::Options opt;
opt.timeout = dns_lookup_timeout;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c1974cf/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 5aa03b6..f8577d1 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1028,7 +1028,7 @@ static const RecordElement RecordsConfig[] =
// # 0 = obey, 1 = ignore, 2 = min(X,ttl), 3 = max(X,ttl)
{RECT_CONFIG, "proxy.config.hostdb.ttl_mode", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-3]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.hostdb.lookup_timeout", RECD_INT, "120", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.hostdb.lookup_timeout", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.hostdb.timeout", RECD_INT, "1440", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
[2/3] trafficserver git commit: Added TS-3462
Posted by zw...@apache.org.
Added TS-3462
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fcb228d9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fcb228d9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fcb228d9
Branch: refs/heads/master
Commit: fcb228d91eebc631cb82f60491ceb0455e2516f2
Parents: 2c1974c
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jun 9 11:51:28 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jun 9 11:51:28 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fcb228d9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 910fad1..ad9ef5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3462] Reduce the HostDB lookup timeout to 30s.
+
*) [TS-3045] Change the default TLS threads setting to -1.
*) [TS-2244] Remove legacy proxy.config.log.search_log_enabled and related
[3/3] trafficserver git commit: TS-3045 Also update records.config
and docs
Posted by zw...@apache.org.
TS-3045 Also update records.config and docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e6f28e18
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e6f28e18
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e6f28e18
Branch: refs/heads/master
Commit: e6f28e18fb93703f635071ae00d57b2b606b9bde
Parents: fcb228d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jun 9 11:53:27 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jun 9 11:53:27 2015 -0600
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 2 +-
proxy/config/records.config.default.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6f28e18/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index c1801b6..2ec8451 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2351,7 +2351,7 @@ SSL Termination
authenticated during the SSL handshake. Clients without a
certificate are not allowed to access Traffic Server.
-.. ts:cv:: CONFIG proxy.config.ssl.number.threads INT 0
+.. ts:cv:: CONFIG proxy.config.ssl.number.threads INT -1
Sets the number of SSL threads to use, this defaults to 0 (autoconfigure).
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e6f28e18/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index 8a11063..f4a52a0 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -11,7 +11,7 @@
CONFIG proxy.config.exec_thread.autoconfig INT 1
CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5
CONFIG proxy.config.exec_thread.limit INT 2
-CONFIG proxy.config.ssl.number.threads INT 0
+CONFIG proxy.config.ssl.number.threads INT -1
CONFIG proxy.config.accept_threads INT 1
CONFIG proxy.config.task_threads INT 2
CONFIG proxy.config.cache.threads_per_disk INT 8