This is an automated email from the ASF dual-hosted git repository.
rshah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new a52bcd82ae Use ATS 9.2 (#7694)
a52bcd82ae is described below
commit a52bcd82ae68ef122e2d83fa865cb26c68b82ee6
Author: Zach Hoffman <[email protected]>
AuthorDate: Thu Aug 3 08:07:49 2023 -0600
Use ATS 9.2 (#7694)
---
.github/actions/repo-info/README.md | 2 +-
.github/workflows/cache-config-tests.yml | 2 +-
.github/workflows/ciab.yaml | 2 +-
.github/workflows/health-client-tests.yml | 2 +-
CHANGELOG.md | 1 +
cache-config/testing/docker/variables.env | 2 +-
docs/source/overview/delivery_services.rst | 26 +++++++++++++-------------
infrastructure/cdn-in-a-box/cache/Dockerfile | 2 ++
lib/go-atscfg/parentdotconfig.go | 2 +-
9 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/.github/actions/repo-info/README.md
b/.github/actions/repo-info/README.md
index f8ee49c953..5fdc4f26e5 100644
--- a/.github/actions/repo-info/README.md
+++ b/.github/actions/repo-info/README.md
@@ -56,5 +56,5 @@ jobs:
with:
- owner: apache
- repo: trafficserver
- - branch: 9.1.x
+ - branch: 9.2.x
```
diff --git a/.github/workflows/cache-config-tests.yml
b/.github/workflows/cache-config-tests.yml
index 39a33aae58..f5ad388501 100644
--- a/.github/workflows/cache-config-tests.yml
+++ b/.github/workflows/cache-config-tests.yml
@@ -18,7 +18,7 @@
name: T3C Integration Tests
env:
- ATS_VERSION: 9.1.x
+ ATS_VERSION: 9.2.x
RHEL_VERSION: 8
TARGET_ARCH: x86_64
diff --git a/.github/workflows/ciab.yaml b/.github/workflows/ciab.yaml
index ac79ce7597..c33e01e2ea 100644
--- a/.github/workflows/ciab.yaml
+++ b/.github/workflows/ciab.yaml
@@ -275,7 +275,7 @@ jobs:
with:
owner: apache
repo: trafficserver
- branch: 9.1.x
+ branch: 9.2.x
id: repo-info
- name: Check Cache
id: ats-rpm-cache
diff --git a/.github/workflows/health-client-tests.yml
b/.github/workflows/health-client-tests.yml
index c9f598e4bc..b1662194fb 100644
--- a/.github/workflows/health-client-tests.yml
+++ b/.github/workflows/health-client-tests.yml
@@ -18,7 +18,7 @@
name: TC Health Client Integration Tests
env:
- ATS_VERSION: 9.1.x
+ ATS_VERSION: 9.2.x
RHEL_VERSION: 8
TARGET_ARCH: x86_64
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f53d73b845..9b1e727cb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7600](https://github.com/apache/trafficcontrol/pull/7600) *t3c* changed
default go-direct command line arg to be old to avoid unexpected config changes
upon upgrade.
- [##7605](https://github.com/apache/trafficcontrol/pull/#7605) *Traffic Ops*
Fixes `cachegroups_request_comments` v5 apis to respond with `RFC3339`
date/time Format.
- [#7621](https://github.com/apache/trafficcontrol/pull/7621) *Traffic Ops*
Use ID token for OAuth authentication, not Access Token
+- [#7694](https://github.com/apache/trafficcontrol/pull/7694) *t3c*, *Traffic
Control Health Client* Upgrade to ATS 9.2
### Fixed
- [#4393](https://github.com/apache/trafficcontrol/issues/4393) *Traffic Ops*
Fixed the error code and alert structure when TO is queried for a delivery
service with no ssl keys.
diff --git a/cache-config/testing/docker/variables.env
b/cache-config/testing/docker/variables.env
index ddcefaaf44..ebf5abb851 100644
--- a/cache-config/testing/docker/variables.env
+++ b/cache-config/testing/docker/variables.env
@@ -57,7 +57,7 @@ TV_USER_PASS=twelve
X509_CA_PERSIST_DIR=/ca
X509_CA_PERSIST_ENV_FILE=/ca/environment
# trafficserver build variables
-ATS_VERSION=9.1.x
+ATS_VERSION=9.2.x
CJOSE_URL=https://github.com/cisco/cjose
CJOSE_TAG=latest
JANSSON_URL=https://github.com/akheron/jansson
diff --git a/docs/source/overview/delivery_services.rst
b/docs/source/overview/delivery_services.rst
index 01d5cff8a4..1f3367169f 100644
--- a/docs/source/overview/delivery_services.rst
+++ b/docs/source/overview/delivery_services.rst
@@ -1036,7 +1036,7 @@ parent.config
"""""""""""""
The following :term:`Parameters` must have the :ref:`Config File
<parameter-config-file>` ``parent.config`` to take effect - even if, strictly
speaking, they aren't used to modify the contents of the :abbr:`ATS (Apache
Traffic Server)` ``parent.config`` configuration file.
-.. seealso:: See the `Apache Traffic Server documentation for parent.config
<https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html>`_
and `their documentation for strategies.yaml
<https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/strategies.yaml.en.html>`_
for more information on its implementation of parent selection (and in
particular Multi-Site Origins).
+.. seealso:: See the `Apache Traffic Server documentation for parent.config
<https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html>`_
and `their documentation for strategies.yaml
<https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/strategies.yaml.en.html>`_
for more information on its implementation of parent selection (and in
particular Multi-Site Origins).
- ``try_all_primaries_before_secondary`` - on a Delivery Service
:term:`Profile`, if this exists, try all "primary parents" before "failing
over" to "secondary parents", which may be ideal if objects are unlikely to be
in cache. The default behavior is to immediately fail to a secondary, which is
ideal if objects are likely to be in cache, as the first consistent-hashed
"secondary parent" will be the "primary parent" in its own :term:`Cache Group`
and therefore receive requests for that [...]
@@ -1066,17 +1066,17 @@ The following :term:`Parameters` must have the
:ref:`Config File <parameter-conf
Parameters that Affect Multi-Site Origin and Parent Down Behavior
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-Each :term:`Parameter` directly corresponds to a field in a line of the
:abbr:`ATS (Apache Traffic Server)` `parent.config file
<https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html>`_
(usually by almost the same name), and documentation for these fields is
provided in the form of links to their entries in the :abbr:`ATS (Apache
Traffic Server)` documentation.
-
-.. _round_robin:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-round-robin
-.. _max_simple_retries:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-max-simple-retries
-.. _max_unavailable_server_retries:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-max-unavailable-server-retries
-.. _parent_retry:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-parent-retry
-.. _unavailable_server_retry_responses:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-unavailable-server-retry-responses
-.. _simple_server_retry_responses:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-simple-server-retry-responses
-.. _parent.config:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html
-.. _parent:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-parent
-.. _secondary_parent:
https://docs.trafficserver.apache.org/en/9.1.x/admin-guide/files/parent.config.en.html#parent-config-format-secondary-parent
+Each :term:`Parameter` directly corresponds to a field in a line of the
:abbr:`ATS (Apache Traffic Server)` `parent.config file
<https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html>`_
(usually by almost the same name), and documentation for these fields is
provided in the form of links to their entries in the :abbr:`ATS (Apache
Traffic Server)` documentation.
+
+.. _round_robin:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-round-robin
+.. _max_simple_retries:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-max-simple-retries
+.. _max_unavailable_server_retries:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-max-unavailable-server-retries
+.. _parent_retry:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-parent-retry
+.. _unavailable_server_retry_responses:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-unavailable-server-retry-responses
+.. _simple_server_retry_responses:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-simple-server-retry-responses
+.. _parent.config:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html
+.. _parent:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-parent
+.. _secondary_parent:
https://docs.trafficserver.apache.org/en/9.2.x/admin-guide/files/parent.config.en.html#parent-config-format-secondary-parent
.. _ds-mso-parameters:
@@ -1113,7 +1113,7 @@ The above :term:`Parameters` are supported for ``first``,
``inner`` and ``last``
The `parent_retry` parameters are now inferred from the `simple retry`
and `unavailable server retry` parameters. To disable "simple retries" for a
:term:`Profile`, set the Value of its ``max_simple_retries`` :term:`Parameter`
to ``0``, and the Value of its ``max_simple_retry_responses`` :term:`Parameter`
to an empty string. "Unavailable server retries" may disabled in much the same
way, using the analogous :term:`Parameters`.
.. impl-detail:: With Apache Traffic Server 8.1.x the
``simple_retry_response_codes`` setting is not available.
-.. impl-detail:: With Apache Traffic Server 9.1.x
``unavailable_server_retry_response_codes`` are limited to 5xx responses and
``simple_retry_response_codes`` are limited to 4xx.
+.. impl-detail:: With Apache Traffic Server 9.2.x
``unavailable_server_retry_response_codes`` are limited to 5xx responses and
``simple_retry_response_codes`` are limited to 4xx.
.. impl-detail:: Apache Traffic Server 9.2.x allows more flexibility with 4xx
and 5xx codes available for use with ``simple_retry_response_codes``.
.. seealso:: To see how the :ref:`Values <parameter-value>` of these
Parameters are interpreted, refer to the `Apache Traffic Server documentation
on the parent.config configuration file
<https://docs.trafficserver.apache.org/en/7.1.x/admin-guide/files/parent.config.en.html>`_
diff --git a/infrastructure/cdn-in-a-box/cache/Dockerfile
b/infrastructure/cdn-in-a-box/cache/Dockerfile
index 2ea6bf47ea..29ed97d923 100644
--- a/infrastructure/cdn-in-a-box/cache/Dockerfile
+++ b/infrastructure/cdn-in-a-box/cache/Dockerfile
@@ -48,6 +48,8 @@ RUN dnf -y install epel-release && \
fi && \
dnf -y install \
brotli \
+ # cjose is required by the ATS TSB RPM
+ cjose \
# find is required by to-access.sh
findutils \
GeoIP \
diff --git a/lib/go-atscfg/parentdotconfig.go b/lib/go-atscfg/parentdotconfig.go
index 3552363e34..282d9861d7 100644
--- a/lib/go-atscfg/parentdotconfig.go
+++ b/lib/go-atscfg/parentdotconfig.go
@@ -1195,7 +1195,7 @@ func (dsparams parentDSParams)
FillParentSvcRetries(isLastCacheTier bool, atsMaj
}
}
- // simple retry responses only supported int ATS for 9.1.x and above
+ // simple retry responses only supported int ATS for 9.2.x and above
if simpleResponseInts, err :=
ParseRetryResponses(dsparams.SimpleServerRetryResponses); err == nil {
pasvc.ErrorResponseCodes = simpleResponseInts
} else {
