trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch 8.1.x updated: Revert "Fixes some places where refactoring was not complete"
Date Thu, 11 Apr 2019 22:40:07 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
     new bd58f52  Revert "Fixes some places where refactoring was not complete"
bd58f52 is described below

commit bd58f523c9eb8fddee15427f8eecdae46827825a
Author: Bryan Call <bcall@apache.org>
AuthorDate: Thu Apr 11 15:39:46 2019 -0700

    Revert "Fixes some places where refactoring was not complete"
    
    This reverts commit 5611b6b4715d3f4d0a20660abf2b5ebdc59da6be.
---
 doc/locale/ja/LC_MESSAGES/admin-guide/files/records.config.en.po      | 2 +-
 .../developer-guide/api/functions/TSHttpOverridableConfig.en.po       | 4 ++++
 lib/perl/lib/Apache/TS/AdminClient.pm                                 | 2 +-
 tests/gold_tests/slow_post/slow_post.test.py                          | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/files/records.config.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/files/records.config.en.po
index baab72c..6838781 100644
--- a/doc/locale/ja/LC_MESSAGES/admin-guide/files/records.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin-guide/files/records.config.en.po
@@ -2335,7 +2335,7 @@ msgid ""
 "Limits the number of requests to be queued when the :ts:cv:`proxy.config."
 "http.origin_max_connections` is reached. When disabled (``-1``) requests "
 "are will wait indefinitely for an available connection. When set to ``0`` "
-"all requests past the :ts:cv:`proxy.config.http.per_server.connection.max` "
+"all requests past the :ts:cv:`proxy.config.http.origin_max_connections` "
 "will immediately fail. When set to ``>0`` ATS will queue that many requests "
 "to go to the origin, any additional requests past the limit will "
 "immediately fail."
diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po
b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po
index 01ef8bb..20e8999 100644
--- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po
+++ b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po
@@ -270,6 +270,10 @@ msgstr ":ts:cv:`proxy.config.http.cache.heuristic_min_lifetime`"
 msgid ":ts:cv:`proxy.config.websocket.active_timeout`"
 msgstr ":ts:cv:`proxy.config.http.cache.heuristic_min_lifetime`"
 
+#: ../../../developer-guide/api/functions/TSHttpOverridableConfig.en.rst:112
+msgid ":ts:cv:`proxy.config.http.origin_max_connections`"
+msgstr ""
+
 #: ../../../developer-guide/api/functions/TSHttpOverridableConfig.en.rst:113
 msgid ":ts:cv:`proxy.config.http.connect_attempts_max_retries`"
 msgstr ""
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index 2f8cac3..a068cc6 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -483,7 +483,7 @@ The Apache Traffic Server Administration Manual will explain what these
strings
  proxy.config.http.no_origin_server_dns
  proxy.config.http.normalize_ae_gzip
  proxy.config.http.number_of_redirections
- proxy.config.http.per_server.connection.max
+ proxy.config.http.origin_max_connections
  proxy.config.http.origin_min_keep_alive_connections
  proxy.config.http.parent_proxies
  proxy.config.http.parent_proxy.connect_attempts_timeout
diff --git a/tests/gold_tests/slow_post/slow_post.test.py b/tests/gold_tests/slow_post/slow_post.test.py
index c1e92f8..906a87f 100644
--- a/tests/gold_tests/slow_post/slow_post.test.py
+++ b/tests/gold_tests/slow_post/slow_post.test.py
@@ -53,9 +53,9 @@ class SlowPostAttack:
         self._ts.Disk.records_config.update({
             'proxy.config.diags.debug.enabled': 1,
             'proxy.config.diags.debug.tags': 'http',
-            'proxy.config.http.per_server.connection.max': self._origin_max_connections,
+            'proxy.config.http.origin_max_connections': self._origin_max_connections,
             # Disable queueing when connection reaches limit
-            'proxy.config.http.per_server.connection.queue_size': 0,
+            'proxy.config.http.origin_max_connections_queue': 0,
         })
 
     def run(self):


Mime
View raw message