[1/2] trafficserver git commit: TS-3659: Add config to limit max number of websocket connections
Repository: trafficserver
Updated Branches:
refs/heads/master e6f28e18f - 2b2d25714
TS-3659: Add config to limit max number of websocket connections
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e31ff43e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e31ff43e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e31ff43e
Branch: refs/heads/master
Commit: e31ff43ee584a628e0391c818d1d238e20c193ce
Parents: e6f28e1
Author: Brian Geffon bri...@apache.org
Authored: Tue Jun 9 23:39:19 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Tue Jun 9 23:39:19 2015 -0700
--
mgmt/RecordsConfig.cc | 6 +-
proxy/http/HttpConfig.cc | 2 ++
proxy/http/HttpConfig.h| 3 ++-
proxy/http/HttpTransact.cc | 14 ++
4 files changed, 23 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e31ff43e/mgmt/RecordsConfig.cc
--
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index f8577d1..48a5557 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -153,7 +153,11 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, proxy.config.http.cache.ignore_accept_charset_mismatch,
RECD_INT, 2, RECU_DYNAMIC, RR_NULL, RECC_INT, [0-2], RECA_NULL}
,
-
+ //
+ // Websocket configs
+ //
+ {RECT_CONFIG, proxy.config.http.websocket.max_number_of_connections,
RECD_INT, -1, RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
//##
//#
//# Redirection
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e31ff43e/proxy/http/HttpConfig.cc
--
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 7a7e9af..b598111 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -934,6 +934,7 @@ HttpConfig::startup()
#endif
HttpEstablishStaticConfigLongLong(c.server_max_connections,
proxy.config.http.server_max_connections);
+ HttpEstablishStaticConfigLongLong(c.max_websocket_connections,
proxy.config.http.websocket.max_number_of_connections);
HttpEstablishStaticConfigLongLong(c.oride.server_tcp_init_cwnd,
proxy.config.http.server_tcp_init_cwnd);
HttpEstablishStaticConfigLongLong(c.oride.origin_max_connections,
proxy.config.http.origin_max_connections);
HttpEstablishStaticConfigLongLong(c.origin_min_keep_alive_connections,
proxy.config.http.origin_min_keep_alive_connections);
@@ -1209,6 +1210,7 @@ HttpConfig::reconfigure()
params-disable_ssl_parenting = INT_TO_BOOL(m_master.disable_ssl_parenting);
params-server_max_connections = m_master.server_max_connections;
+ params-max_websocket_connections = m_master.max_websocket_connections;
params-oride.server_tcp_init_cwnd = m_master.oride.server_tcp_init_cwnd;
params-oride.origin_max_connections = m_master.oride.origin_max_connections;
params-origin_min_keep_alive_connections =
m_master.origin_min_keep_alive_connections;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e31ff43e/proxy/http/HttpConfig.h
--
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index fc3cec8..07b2a4c 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -611,6 +611,7 @@ public:
MgmtInt server_max_connections;
MgmtInt origin_min_keep_alive_connections; // TODO: This one really ought to
be overridable, but difficult right now.
MgmtInt attach_server_session_to_client;
+ MgmtInt max_websocket_connections;
MgmtByte parent_proxy_routing_enable;
MgmtByte disable_ssl_parenting;
@@ -839,7 +840,7 @@ extern volatile int32_t icp_dynamic_enabled;
/
/
inline HttpConfigParams::HttpConfigParams()
- : proxy_hostname(NULL), proxy_hostname_len(0), server_max_connections(0),
origin_min_keep_alive_connections(0),
+ : proxy_hostname(NULL), proxy_hostname_len(0), server_max_connections(0),
origin_min_keep_alive_connections(0), max_websocket_connections(-1),
parent_proxy_routing_enable(0), disable_ssl_parenting(0),
enable_url_expandomatic(0), no_dns_forward_to_parent(0),
uncacheable_requests_bypass_parent(1), no_origin_server_dns(0),
use_client_target_addr(0), use_client_source_port(0),
proxy_request_via_string(NULL), proxy_request_via_string_len(0),
proxy_response_via_string(NULL),
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e31ff43e/proxy/http/HttpTransact.cc
[2/2] trafficserver git commit: TS-3659: Add config to limit max number of websocket connections: UPDATE CHANGES
TS-3659: Add config to limit max number of websocket connections: UPDATE CHANGES Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2b2d2571 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b2d2571 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b2d2571 Branch: refs/heads/master Commit: 2b2d2571488498e1adcfda4cce349ab1d60b58f8 Parents: e31ff43 Author: Brian Geffon bri...@apache.org Authored: Tue Jun 9 23:39:41 2015 -0700 Committer: Brian Geffon bri...@apache.org Committed: Tue Jun 9 23:39:41 2015 -0700 -- CHANGES | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b2d2571/CHANGES -- diff --git a/CHANGES b/CHANGES index ad9ef5b..3cf8481 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3659] Add config to limit max number of websocket connections + *) [TS-3462] Reduce the HostDB lookup timeout to 30s. *) [TS-3045] Change the default TLS threads setting to -1.
trafficserver git commit: TS-3659: Add config to limit max number of websocket connections: UPDATE DOCS
Repository: trafficserver Updated Branches: refs/heads/master 2b2d25714 - 2ccc2c2ee TS-3659: Add config to limit max number of websocket connections: UPDATE DOCS Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2ccc2c2e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2ccc2c2e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2ccc2c2e Branch: refs/heads/master Commit: 2ccc2c2ee2a52c645d69ea713784f0d613b9325c Parents: 2b2d257 Author: Brian Geffon bri...@apache.org Authored: Wed Jun 10 00:09:47 2015 -0700 Committer: Brian Geffon bri...@apache.org Committed: Wed Jun 10 00:09:47 2015 -0700 -- doc/reference/configuration/records.config.en.rst | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ccc2c2e/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 2ec8451..de695b0 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -1134,6 +1134,11 @@ Congestion Control The low water mark for transaction buffer control. External source I/O is resumed when the total buffer space in use by the transaction is no more than this value. +.. ts:cv:: CONFIG proxy.config.http.websocket.max_number_of_connections INT -1 + :reloadable: + + When enabled = (``0``), Traffic Server will enforce a maximum number of simultaneous websocket connections. + Negative Response Caching =
[2/2] trafficserver git commit: Added message about the unit of time
Added message about the unit of time
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fa535cee
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fa535cee
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fa535cee
Branch: refs/heads/master
Commit: fa535ceef07f05baf9db27300079aab44157cb42
Parents: 4842aef
Author: Bryan Call bc...@apache.org
Authored: Wed Jun 10 09:21:40 2015 -0700
Committer: Bryan Call bc...@apache.org
Committed: Wed Jun 10 09:21:40 2015 -0700
--
tools/slow_log_report.pl | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fa535cee/tools/slow_log_report.pl
--
diff --git a/tools/slow_log_report.pl b/tools/slow_log_report.pl
index 66a83a0..19cf8a1 100755
--- a/tools/slow_log_report.pl
+++ b/tools/slow_log_report.pl
@@ -56,6 +56,7 @@ sub displayStat($) {
printf(%25s %10.2f %10.2f %10.2f %10.2f %10.2f %10.2f %10.2f\n, $key,
$total, $count, $mean, $median, $p95th, $min, $max);
}
+ print NOTE: Times are in seconds\n;
}
{
[2/2] trafficserver git commit: TS-3542 Remove the reclaimable freelist feature, it will be replaced with a buddy allocation scheme
TS-3542 Remove the reclaimable freelist feature, it will be replaced with a
buddy allocation scheme
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7142d326
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7142d326
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7142d326
Branch: refs/heads/master
Commit: 7142d326a5068f2423edf8ac4939bf2ee0289b29
Parents: 5dd6b20
Author: Leif Hedstrom zw...@apache.org
Authored: Thu Apr 30 11:02:58 2015 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Jun 10 18:06:42 2015 -0600
--
ci/jenkins/bin/in_tree.sh | 1 -
ci/jenkins/bin/out_of_tree.sh | 1 -
ci/tsqa/tests/test_regressions.py | 1 -
configure.ac | 20 -
iocore/eventsystem/I_IOBuffer.h | 4 -
iocore/eventsystem/I_ProxyAllocator.h | 16 +-
iocore/eventsystem/ProxyAllocator.cc | 10 +-
lib/ts/Makefile.am| 2 -
lib/ts/ink_config.h.in| 1 -
lib/ts/ink_queue.cc | 27 +-
lib/ts/ink_queue.h| 7 -
lib/ts/ink_queue_ext.cc | 660 -
lib/ts/ink_queue_ext.h| 137 --
proxy/http/HttpConfig.cc | 7 -
proxy/http/HttpConfig.h | 8 +-
15 files changed, 12 insertions(+), 890 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7142d326/ci/jenkins/bin/in_tree.sh
--
diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh
index f395835..1c78fbd 100755
--- a/ci/jenkins/bin/in_tree.sh
+++ b/ci/jenkins/bin/in_tree.sh
@@ -31,7 +31,6 @@ autoreconf -fi
--enable-experimental-plugins \
--enable-example-plugins \
--enable-test-tools \
---enable-reclaimable-freelist \
--enable-wccp \
${enable_cppapi} \
CORES=2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7142d326/ci/jenkins/bin/out_of_tree.sh
--
diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh
index 3f82106..f7e09c0 100755
--- a/ci/jenkins/bin/out_of_tree.sh
+++ b/ci/jenkins/bin/out_of_tree.sh
@@ -28,7 +28,6 @@ mkdir -p BUILDS cd BUILDS
--enable-experimental-plugins \
--enable-example-plugins \
--enable-test-tools \
---enable-reclaimable-freelist \
--enable-wccp \
CORES=2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7142d326/ci/tsqa/tests/test_regressions.py
--
diff --git a/ci/tsqa/tests/test_regressions.py
b/ci/tsqa/tests/test_regressions.py
index e49aa74..64f1a81 100644
--- a/ci/tsqa/tests/test_regressions.py
+++ b/ci/tsqa/tests/test_regressions.py
@@ -52,7 +52,6 @@ class TestRegressions(helpers.EnvironmentCase):
cmd = [os.path.join(self.environment.layout.bindir, 'traffic_server'),
'-R', '1']
tsqa.utils.run_sync_command(cmd, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
-
class TestRegressionsLinuxNativeAIO(TestRegressions):
'''
Run the built-in traffic_server regression test suite with
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7142d326/configure.ac
--
diff --git a/configure.ac b/configure.ac
index 3f130af..ee1182f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,26 +368,6 @@ TS_ARG_ENABLE_VAR([use], [freelist])
AC_SUBST(use_freelist)
#
-# The original InkFreeList memory pool could not reclaim itself
-# automatically. We can use '--enable-reclaimable-freelist' option
-# to enable the reclaiming feature. This option is effective only
-# when freelist is enable.
-#
-if test x${enable_freelist} = xyes; then
- AC_MSG_CHECKING([whether to enable reclaimable freelist])
- AC_ARG_ENABLE([reclaimable-freelist],
-[AS_HELP_STRING([--enable-reclaimable-freelist],
-[enable reclaimable freelist support
(effective only when freelist is enabled)])],
-[],
-[enable_reclaimable_freelist=no])
- AC_MSG_RESULT([$enable_reclaimable_freelist])
-else
- enable_reclaimable_freelist=no
-fi
-TS_ARG_ENABLE_VAR([use], [reclaimable_freelist])
-AC_SUBST(use_reclaimable_freelist)
-
-#
# Options for SPDY
#
AC_MSG_CHECKING([whether to enable spdy])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7142d326/iocore/eventsystem/I_IOBuffer.h
--
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index c167bb4..6416e2b 100644
--- a/iocore/eventsystem/I_IOBuffer.h
[1/2] trafficserver git commit: Added TS-3542
Repository: trafficserver Updated Branches: refs/heads/master 5dd6b204f - 983e0803e Added TS-3542 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/983e0803 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/983e0803 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/983e0803 Branch: refs/heads/master Commit: 983e0803e36b98850355fa5e221b649d10d3ce8b Parents: 7142d32 Author: Leif Hedstrom zw...@apache.org Authored: Wed Jun 10 18:06:36 2015 -0600 Committer: Leif Hedstrom zw...@apache.org Committed: Wed Jun 10 18:06:42 2015 -0600 -- CHANGES | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/983e0803/CHANGES -- diff --git a/CHANGES b/CHANGES index 285a3c1..7835863 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3542] Remove the reclaimable freelist feature, it will be replaced + with a buddy allocation scheme. + *) [TS-3682] Change default for proxy.config.admin.api.restricted to '0'. *) [TS-3659] Add config to limit max number of websocket connections
[2/2] trafficserver git commit: Add TS-3466
Add TS-3466 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6c4d0d7e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6c4d0d7e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6c4d0d7e Branch: refs/heads/master Commit: 6c4d0d7e876c352099b067a05cbafa004acfaef1 Parents: ed93b8d Author: Leif Hedstrom zw...@apache.org Authored: Wed Jun 10 23:00:54 2015 -0600 Committer: Leif Hedstrom zw...@apache.org Committed: Wed Jun 10 23:00:54 2015 -0600 -- CHANGES | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6c4d0d7e/CHANGES -- diff --git a/CHANGES b/CHANGES index a3bb3b7..6ac5c76 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3466] Remove unused proxy.config.user_name config. + *) [TS-3524] Add a new log tag, %cluc, which is the cache lookup URL (cache key).
[1/2] trafficserver git commit: TS-3466 Remove unused proxy.config.user_name config
Repository: trafficserver
Updated Branches:
refs/heads/master f9ead0b0b - 6c4d0d7e8
TS-3466 Remove unused proxy.config.user_name config
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ed93b8d0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ed93b8d0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ed93b8d0
Branch: refs/heads/master
Commit: ed93b8d01f8f0201c28acd289ee6ad11a39bc007
Parents: f9ead0b
Author: Leif Hedstrom zw...@apache.org
Authored: Tue Jun 9 11:58:19 2015 -0600
Committer: Leif Hedstrom zw...@apache.org
Committed: Wed Jun 10 23:00:07 2015 -0600
--
lib/perl/lib/Apache/TS/AdminClient.pm | 1 -
mgmt/RecordsConfig.cc | 2 --
2 files changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed93b8d0/lib/perl/lib/Apache/TS/AdminClient.pm
--
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm
b/lib/perl/lib/Apache/TS/AdminClient.pm
index 5653812..cfa824f 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -709,7 +709,6 @@ The Apache Traffic Server Administration Manual will
explain what these strings
proxy.config.url_remap.filename
proxy.config.url_remap.pristine_host_hdr
proxy.config.url_remap.remap_required
- proxy.config.user_name
proxy.config.vmap.addr_file
proxy.config.vmap.down_up_timeout
proxy.config.vmap.enabled
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ed93b8d0/mgmt/RecordsConfig.cc
--
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 4ff9cec..b735721 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -127,8 +127,6 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, proxy.config.thread.default.stacksize, RECD_INT, 1048576,
RECU_RESTART_TS, RR_NULL, RECC_INT, [131072-104857600], RECA_READ_ONLY}
,
- {RECT_CONFIG, proxy.config.user_name, RECD_STRING, nobody, RECU_NULL,
RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, proxy.config.restart.active_client_threshold, RECD_INT, 0,
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
[2/2] trafficserver git commit: Added TS-3524 to CHANGES, and update docs.
Added TS-3524 to CHANGES, and update docs. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f9ead0b0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f9ead0b0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f9ead0b0 Branch: refs/heads/master Commit: f9ead0b0b6a21a42c6edb79912afbc520f620c24 Parents: 719d55b Author: Leif Hedstrom zw...@apache.org Authored: Wed Jun 10 22:17:33 2015 -0600 Committer: Leif Hedstrom zw...@apache.org Committed: Wed Jun 10 22:33:05 2015 -0600 -- CHANGES| 3 +++ doc/admin/event-logging-formats.en.rst | 6 ++ 2 files changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f9ead0b0/CHANGES -- diff --git a/CHANGES b/CHANGES index 7835863..a3bb3b7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3524] Add a new log tag, %cluc, which is the cache lookup URL + (cache key). + *) [TS-3542] Remove the reclaimable freelist feature, it will be replaced with a buddy allocation scheme. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f9ead0b0/doc/admin/event-logging-formats.en.rst -- diff --git a/doc/admin/event-logging-formats.en.rst b/doc/admin/event-logging-formats.en.rst index c538fc7..4e1c7cc 100644 --- a/doc/admin/event-logging-formats.en.rst +++ b/doc/admin/event-logging-formats.en.rst @@ -235,6 +235,12 @@ The following list describes Traffic Server custom logging fields. The client request unmapped URL host. This field records a URL's host before it is remapped (reverse proxy mode). +.. _cluc: + +``cluc`` +The cache lookup URL, or cache key, for the client request. This URL is +canonicalized as well. + .. _crat: ``crat``
