caddy-frontend: Follow up ATS 9 upgrade

By following: https://docs.trafficserver.apache.org/en/9.0.x/release-notes/upgrading.en.html configuration has been adapted. Tests to new version string has been adapted with smaller fixes, including a bit more time for log to appear in squid.log.

caddy-frontend: Follow up ATS 9 upgrade
By following: https://docs.trafficserver.apache.org/en/9.0.x/release-notes/upgrading.en.html configuration has been adapted. Tests to new version string has been adapted with smaller fixes, including a bit more time for log to appear in squid.log.
5d2f2356 · Łukasz Nowak · ef320c66 · 5d2f2356 · 5d2f2356 · 5d2f2356
Commit 5d2f2356 authored May 11, 2021 by Łukasz Nowak
5 changed files
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68

 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = dd6542a91746e6e3720eaa1590792dbe
+md5sum = 28220d18308313d49a38d39c61a7e769

 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -62,7 +62,7 @@ md5sum = 975177dedf677d24e14cede5d13187ce

 [template-trafficserver-records-config]
 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
-md5sum = ab0c9ea9bfe7a63a267331d9e010d0c6
+md5sum = 88a2db868720009f6092843784b06611

 [template-trafficserver-storage-config]
 _update_hash_filename_ = templates/trafficserver/storage.config.jinja2
@@ -70,7 +70,7 @@ md5sum = d022455a8610bac2dd51101edb035987

 [template-trafficserver-logging-yaml]
 _update_hash_filename_ = templates/trafficserver/logging.yaml.jinja2
-md5sum = 45f379e887de07d2b86de2f43937f856
+md5sum = 368b271215a92594ca9e2fa3102d484f

 [template-nginx-eventsource-slave-virtualhost]
 _update_hash_filename_ = templates/nginx-eventsource-slave.conf.in

--- a/software/caddy-frontend/instance-apache-frontend.cfg.in
+++ b/software/caddy-frontend/instance-apache-frontend.cfg.in
@@ -466,7 +466,9 @@ target = ${trafficserver-directory:configuration}
 recipe = slapos.cookbook:wrapper
 command-line = {{ software_parameter_dict['trafficserver'] }}/bin/traffic_manager
 wrapper-path = ${trafficserver-variable:wrapper-path}
-environment = TS_ROOT=${buildout:directory}
+environment =
+  TS_ROOT=${buildout:directory}
+  PROXY_CONFIG_CONFIG_DIR=${trafficserver-directory:configuration}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg

 [trafficserver-reload]

--- a/software/caddy-frontend/templates/trafficserver/logging.yaml.jinja2
+++ b/software/caddy-frontend/templates/trafficserver/logging.yaml.jinja2
-formats:
-  - name: squid
-    format: '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<cluc> %<caun> %<phr>/%<shn> %<psct>'
-logs:
-  - filename: squid
-    format: squid
-    mode: ascii
-    rolling_enabled: 1
-    rolling_interval_sec: 86400
-    rolling_offset_hr: 0
+logging:
+  formats:
+    - name: squid
+      format: '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<cluc> %<caun> %<phr>/%<shn> %<psct>'
+  logs:
+    - filename: squid
+      format: squid
+      mode: ascii
+      rolling_enabled: 1
+      rolling_interval_sec: 86400
+      rolling_offset_hr: 0
--- a/software/caddy-frontend/templates/trafficserver/records.config.jinja2
+++ b/software/caddy-frontend/templates/trafficserver/records.config.jinja2
@@ -9,14 +9,11 @@
 ##############################################################################
 CONFIG proxy.config.proxy_name STRING {{ ats_configuration['hostname'] }}
 CONFIG proxy.config.local_state_dir STRING {{ ats_directory['local-state'] }}
-CONFIG proxy.config.config_dir STRING {{ ats_directory['configuration'] }}
 CONFIG proxy.config.bin_path STRING {{ ats_directory['bin_path'] }}
 CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.alarm_email STRING nobody
 CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
 CONFIG proxy.config.output.logfile STRING traffic.out
 CONFIG proxy.config.admin.user_id STRING {{ '#%s' % os_module.geteuid() }}
-CONFIG proxy.config.admin.number_config_bak INT 0
 LOCAL proxy.local.incoming_ip_to_bind STRING {{ ats_configuration['local-ip'] }}
 CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }}
 # Implement RFC 5861 with core
@@ -66,7 +63,6 @@ CONFIG proxy.config.http.insert_response_via_str INT 0
 #    https://docs.trafficserver.apache.org/records.config#parent-proxy-configuration
 #    https://docs.trafficserver.apache.org/en/latest/admin-guide/files/parent.config.en.html
 ##############################################################################
-CONFIG proxy.config.http.parent_proxy_routing_enable INT 0
 CONFIG proxy.config.http.parent_proxy.retry_time INT 300
 CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout INT 30
 CONFIG proxy.config.http.forward.proxy_auth_to_parent INT 0
@@ -152,7 +148,7 @@ CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10
 ##############################################################################
 CONFIG proxy.config.net.connections_throttle INT 30000
 CONFIG proxy.config.net.max_connections_in INT 30000
-CONFIG proxy.config.net.max_connections_active_in INT 10000
+CONFIG proxy.config.net.max_requests_in INT 10000

 ##############################################################################
 # RAM and disk cache configurations. Docs:
@@ -197,7 +193,7 @@ CONFIG proxy.config.reverse_proxy.enabled INT 1
 #    https://docs.trafficserver.apache.org/records.config#client-related-configuration
 #    https://docs.trafficserver.apache.org/en/latest/admin-guide/files/ssl_multicert.config.en.html
 ##############################################################################
-CONFIG proxy.config.ssl.client.verify.server INT 0
+CONFIG proxy.config.ssl.client.verify.server.properties STRING NONE
 CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
 CONFIG proxy.config.ssl.server.cipher_suite STRING ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA


--- a/software/caddy-frontend/test/test.py
+++ b/software/caddy-frontend/test/test.py
@@ -3623,7 +3623,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

  def test_enable_cache_server_alias(self):
@@ -3665,7 +3665,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

    result = fakeHTTPResult(
@@ -3782,7 +3782,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

    # BEGIN: Check that squid.log is correctly filled in
@@ -3790,13 +3790,13 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
      os.path.join(
        self.instance_path, '*', 'var', 'log', 'trafficserver', 'squid.log'
      ))
-    if len(ats_log_file_list) == 1:
-      ats_log_file = ats_log_file_list[0]
+    self.assertEqual(1, len(ats_log_file_list))
+    ats_log_file = ats_log_file_list[0]
    direct_pattern = re.compile(
      r'.*TCP_MISS/200 .*test-path/deeper.*enablecache.example.com'
      '.* - DIRECT*')
    # ATS needs some time to flush logs
-    timeout = 5
+    timeout = 10
    b = time.time()
    while True:
      direct_pattern_match = 0
@@ -3976,7 +3976,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

    # check stale-if-error support is really respected if not present in the
@@ -4052,7 +4052,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    pattern = re.compile(
      r'.*ERR_READ_TIMEOUT/504 .*test_enable_cache_ats_timeout'
      '.*TIMEOUT_DIRECT*')
-    timeout = 5
+    timeout = 10
    b = time.time()
    # ATS needs some time to flush logs
    while True:
@@ -4119,7 +4119,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

    try:
@@ -4166,7 +4166,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    self.assertNotEqual(via, None)
    self.assertRegexpMatches(
      via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/8.1.1\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/9.0.1\)$'
    )

  def test_enable_http2_false(self):