Author: zwoop
Date: Sat Jan 29 03:15:39 2011
New Revision: 1064949
URL: http://svn.apache.org/viewvc?rev=1064949&view=rev
Log:
TS-505 Cleanup unused configuration
Also update the CHANGES file.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http/HttpConfig.h
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1064949&r1=1064948&r2=1064949&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Sat Jan 29 03:15:39 2011
@@ -2,6 +2,17 @@
Changes with Apache Traffic Server 2.1.6
+ *) Changed the defaults to deal with read contention on the cache, this
+ dramatically improves the performance on cache misses [TS-505, TS-506].
+
+ *) Reorganize some code to reduce binary foot prints [TS-655].
+
+ *) Bogus logcat conversion of squid timestamps [TS-653].
+
+ *) Unable to purge objects on other servers in full cluster mode [TS-643].
+
+ *) New 64-bit random generator.
+
*) Rename the management APIs from INK* to TS* [TS-639].
*) Remove the dead v2 stats code [TS-650].
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1064949&r1=1064948&r2=1064949&view=diff
==============================================================================
---
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
(original)
+++
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
Sat Jan 29 03:15:39 2011
@@ -431,7 +431,6 @@ The Apache Traffic Server Administration
proxy.config.http.cache.max_open_write_retries
proxy.config.http.cache.max_stale_age
proxy.config.http.cache.open_read_retry_time
- proxy.config.http.cache.open_write_retry_time
proxy.config.http.cache.range.lookup
proxy.config.http.cache.required_headers
proxy.config.http.cache.vary_default_images
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1064949&r1=1064948&r2=1064949&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Sat Jan 29 03:15:39 2011
@@ -749,8 +749,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.http.cache.max_open_write_retries", RECD_INT,
"1", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.cache.open_write_retry_time", RECD_INT,
"500", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
// # when_to_revalidate has 4 options:
// #
// # 0 - default. use use cache directives or heuristic
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.cc?rev=1064949&r1=1064948&r2=1064949&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.cc Sat Jan 29 03:15:39
2011
@@ -1276,7 +1276,6 @@ HttpConfig::startup()
// open write failure retries
HttpEstablishStaticConfigLongLong(c.max_cache_open_write_retries,
"proxy.config.http.cache.max_open_write_retries");
- HttpEstablishStaticConfigLongLong(c.cache_open_write_retry_time,
"proxy.config.http.cache.open_write_retry_time");
HttpEstablishStaticConfigLongLong(c.oride.cache_http,
"proxy.config.http.cache.http");
HttpEstablishStaticConfigLongLong(c.oride.cache_ignore_client_no_cache,
"proxy.config.http.cache.ignore_client_no_cache");
@@ -1571,11 +1570,6 @@ HttpConfig::reconfigure()
// open write failure retries
params->max_cache_open_write_retries = m_master.max_cache_open_write_retries;
- params->cache_open_write_retry_time = m_master.cache_open_write_retry_time;
-
- // open write failure retries
- params->max_cache_open_write_retries = m_master.max_cache_open_write_retries;
- params->cache_open_write_retry_time = m_master.cache_open_write_retry_time;
params->oride.cache_http = INT_TO_BOOL(m_master.oride.cache_http);
params->oride.cache_ignore_client_no_cache =
INT_TO_BOOL(m_master.oride.cache_ignore_client_no_cache);
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.h?rev=1064949&r1=1064948&r2=1064949&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.h Sat Jan 29 03:15:39 2011
@@ -677,7 +677,6 @@ public:
// open write failure retries.
MgmtInt max_cache_open_write_retries;
- MgmtInt cache_open_write_retry_time; // time is in mseconds
///////////////////
// cache control //
@@ -968,7 +967,6 @@ HttpConfigParams::HttpConfigParams()
max_cache_open_read_retries(0),
cache_open_read_retry_time(0),
max_cache_open_write_retries(0),
- cache_open_write_retry_time(0),
cache_enable_default_vary_headers(false),
cache_when_to_add_no_cache_to_msie_requests(0),
connect_ports_string(0),
