trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject svn commit: r909640 - in /incubator/trafficserver/traffic/trunk: iocore/net/Net.cc iocore/net/P_UnixNet.h iocore/net/UnixNet.cc proxy/mgmt2/RecordsConfig.cc
Date Fri, 12 Feb 2010 22:28:31 GMT
Author: bcall
Date: Fri Feb 12 22:28:30 2010
New Revision: 909640

URL: http://svn.apache.org/viewvc?rev=909640&view=rev
Log:
TS-176 Workaround to turn off connection throttling, because the
connection count can sometimes be off.
Review: Bryan
Author: Vijay
Patch submitted by: Wendy

Modified:
    incubator/trafficserver/traffic/trunk/iocore/net/Net.cc
    incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
    incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc

Modified: incubator/trafficserver/traffic/trunk/iocore/net/Net.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/Net.cc?rev=909640&r1=909639&r2=909640&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/Net.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/Net.cc Fri Feb 12 22:28:30 2010
@@ -44,6 +44,7 @@
 
   IOCORE_RegisterConfigUpdateFunc("proxy.config.net.connections_throttle", change_net_connections_throttle,
NULL);
   IOCORE_ReadConfigInteger(fds_throttle, "proxy.config.net.connections_throttle");
+  IOCORE_ReadConfigInteger(throttle_enabled,"proxy.config.net.throttle_enabled");
 
   IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.net.listen_backlog", 1024, RECU_DYNAMIC,
RECC_NULL, NULL);
 

Modified: incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=909640&r1=909639&r2=909640&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Fri Feb 12 22:28:30 2010
@@ -63,6 +63,7 @@
 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;
@@ -219,6 +220,11 @@
 INK_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;

Modified: incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=909640&r1=909639&r2=909640&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/net/UnixNet.cc Fri Feb 12 22:28:30 2010
@@ -28,6 +28,7 @@
 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;
 

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=909640&r1=909639&r2=909640&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Fri Feb 12 22:28:30
2010
@@ -2118,6 +2118,8 @@
   {CONFIG, "proxy.config.net.connections_throttle", "", INK_INT, "<connections_throttle>",
RU_RESTART_TS, RR_REQUIRED,
    RC_STR, "^[0-9]+$", RA_NULL}
   ,
+  {CONFIG, "proxy.config.net.throttle_enabled", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL,
"[0-1]", RA_NULL}
+  ,
   {CONFIG, "proxy.config.net.max_poll_delay", "", INK_INT, "128", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.net.listen_backlog", "", INK_INT, "1024", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}



Mime
View raw message