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 2013/04/18 04:14:36 UTC
git commit: TS-1801 Remove proxy.config.net.throttle_enabled
Updated Branches:
refs/heads/master 5b44534f7 -> dcd75114c
TS-1801 Remove proxy.config.net.throttle_enabled
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dcd75114
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dcd75114
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dcd75114
Branch: refs/heads/master
Commit: dcd75114c9c4d60a2362068da69dc289a05799cc
Parents: 5b44534
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Apr 4 16:03:20 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Apr 17 20:14:06 2013 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
.../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 1 -
iocore/net/Net.cc | 1 -
iocore/net/P_UnixNet.h | 7 +------
iocore/net/UnixNet.cc | 1 -
mgmt/RecordsConfig.cc | 2 --
6 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1347733..86b57d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 3.3.3
+ *) [TS-1801] Remove proxy.config.net.throttle_enabled, it's an artifact
+ of a debugging case, and should not have been included upstream.
+
*) [TS-1829] values exceed capacity of 'long' data type on 32-bit
*) [TS-1755] add basic logstats tests
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
index ab3d421..7e1faa0 100644
--- a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
+++ b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
@@ -613,7 +613,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.net.sock_send_buffer_size_in
proxy.config.net.sock_send_buffer_size_out
proxy.config.net.defer_accept
- proxy.config.net.throttle_enabled
proxy.config.output.logfile
proxy.config.ping.npacks_to_trans
proxy.config.ping.timeout_sec
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/iocore/net/Net.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index ef351e3..2e3a782 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -39,7 +39,6 @@ configure_net(void)
{
REC_RegisterConfigUpdateFunc("proxy.config.net.connections_throttle", change_net_connections_throttle, NULL);
REC_ReadConfigInteger(fds_throttle, "proxy.config.net.connections_throttle");
- REC_ReadConfigInteger(throttle_enabled,"proxy.config.net.throttle_enabled");
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/iocore/net/P_UnixNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 824f46f..139d064 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -129,7 +129,6 @@ extern ink_hrtime last_shedding_warning;
extern ink_hrtime emergency_throttle_time;
extern int net_connections_throttle;
extern int fds_throttle;
-extern bool throttle_enabled;
extern int fds_limit;
extern ink_hrtime last_transient_accept_error;
extern int http_accept_port_number;
@@ -262,12 +261,8 @@ emergency_throttle(ink_hrtime now)
TS_INLINE int
check_net_throttle(ThrottleType t, ink_hrtime now)
{
- if(throttle_enabled == false) {
- // added by Vijay to disable throttle. This is done find out if
- // there any other problem other than the stats problem -- bug 3040824
- return false;
- }
int connections = net_connections_to_throttle(t);
+
if (connections >= net_connections_throttle)
return true;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/iocore/net/UnixNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index d8ea840..32f4e61 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -28,7 +28,6 @@ ink_hrtime last_shedding_warning;
ink_hrtime emergency_throttle_time;
int net_connections_throttle;
int fds_throttle;
-bool throttle_enabled;
int fds_limit = 8000;
ink_hrtime last_transient_accept_error;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dcd75114/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index df1e5ef..1298b18 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -803,8 +803,6 @@ RecordElement RecordsConfig[] = {
//##############################################################################
{RECT_CONFIG, "proxy.config.net.connections_throttle", RECD_INT, "30000", RECU_RESTART_TS, RR_REQUIRED, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.net.throttle_enabled", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.net.listen_backlog", RECD_INT, "1024", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
// This option takes different defaults depending on features / platform. TODO: This should use the