trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [17/18] git commit: Add documentation for proxy.config.net.connections_throttle, as well as fixing references to it
Date Sat, 08 Mar 2014 14:46:29 GMT
Add documentation for proxy.config.net.connections_throttle, as well as fixing references to
it


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9e5e7fe5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9e5e7fe5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9e5e7fe5

Branch: refs/heads/master
Commit: 9e5e7fe52eb5d71f4118b009818c1c3f3c67d11d
Parents: f63a627
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Sat Mar 8 00:50:54 2014 +0000
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Sat Mar 8 07:45:50 2014 -0700

----------------------------------------------------------------------
 doc/admin/faqs.en.rst                             |  4 ++--
 doc/admin/working-log-files.en.rst                |  2 ++
 doc/locale/ja/LC_MESSAGES/admin/faqs.en.po        |  2 +-
 doc/reference/configuration/records.config.en.rst | 12 +++++++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e5e7fe5/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index bc695db..3e1e336 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -252,7 +252,7 @@ The following message appears in the system log file: ::
 A requested object was larger than the maximum size allowed in the
 Traffic Server cache, so Traffic Server provided proxy service for the
 oversized object but did not cache it. To set the object size limit for
-the cache, modify the :ts:cv:`proxy.config.cache.limits.http.max_doc_size`
+the cache, modify the :ts:cv:`proxy.config.cache.max_doc_size`
 variable in the records.config file. If you do not want to limit the
 size of objects in the cache, then set the document size
 to ``0`` (zero).
@@ -354,7 +354,7 @@ Connection throttle events can occur under the following conditions:
 
 If necessary, you can reset the maximum number of connections supported
 by Traffic Server by editing the value of the
-:ref:`proxy.config.net.connections_throttle` configuration variable in
+:ts:cv:`proxy.config.net.connections_throttle` configuration variable in
 the records.config file. Do not increase the connection throttle limit
 unless the system has adequate memory to handle the client connections
 required. A system with limited RAM might need a throttle limit lower

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e5e7fe5/doc/admin/working-log-files.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/working-log-files.en.rst b/doc/admin/working-log-files.en.rst
index fa74d02..6c4701b 100644
--- a/doc/admin/working-log-files.en.rst
+++ b/doc/admin/working-log-files.en.rst
@@ -901,6 +901,8 @@ This section shows an example log file entry in each of the standard log
 formats supported by Traffic Server: Squid, Netscape Common, Netscape Extended,
 and Netscape Extended-2.
 
+.. _log-formats-squid-format:
+
 Squid Format
 ------------
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e5e7fe5/doc/locale/ja/LC_MESSAGES/admin/faqs.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/faqs.en.po b/doc/locale/ja/LC_MESSAGES/admin/faqs.en.po
index b7e4fbb..79d87c9 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/faqs.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/faqs.en.po
@@ -458,7 +458,7 @@ msgid ""
 "A requested object was larger than the maximum size allowed in the Traffic "
 "Server cache, so Traffic Server provided proxy service for the oversized "
 "object but did not cache it. To set the object size limit for the cache, "
-"modify the :ts:cv:`proxy.config.cache.limits.http.max_doc_size` variable in "
+"modify the :ts:cv:`proxy.config.cache.max_doc_size` variable in "
 "the records.config file. If you do not want to limit the size of objects in "
 "the cache, then set the document size to ``0`` (zero)."
 msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e5e7fe5/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 4d3342c..1e397df 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -251,6 +251,16 @@ Value Effect
 Network
 =======
 
+.. ts:cv:: CONFIG proxy.config.net.connections_throttle INT 10000
+
+   The total number of client and origin server connections that the server
+   can handle simultaneously. This is in fact the max number of file
+   descriptors that the :program:`traffic_server` process can have open at any
+   given time. Roughly 10% of these connections are reserved for origin server
+   connections, i.e. from the default, only ~9,000 client connections can be
+   handled. This should be tuned according to your memory size, and expected
+   work load.
+
 .. ts:cv:: LOCAL proxy.local.incoming_ip_to_bind STRING 0.0.0.0 [::]
 
    Controls the global default IP addresses to which to bind proxy server ports. The value
is a space separated list of IP addresses, one per supported IP address family (currently
IPv4 and IPv6).
@@ -831,7 +841,7 @@ Origin Server Connect Attempts
 
    .. note::
         This value is used in determining when and if to prune active origin sessions. Without
this value set connections
-        to origins can consume all the way up to ``proxy.config.net.connections_throttle``
connections, which in turn can
+        to origins can consume all the way up to ts:cv:`proxy.config.net.connections_throttle`
connections, which in turn can
         starve incoming requests from available connections.
 
 .. ts:cv:: CONFIG proxy.config.http.origin_max_connections INT 0


Mime
View raw message