Working on Traffic Server 10.1 upgrades and cleanup.

Author: GUI

src/api-umbrella/cli/reload.lua

@@ -13,7 +13,7 @@ local function reload_perp(perp_base)
 end
 
 local function reload_trafficserver()
-  local _, err = shell_blocking_capture_combined({ "env", "TS_ROOT=" .. config["root_dir"], "traffic_ctl", "config", "reload" })
+  local _, err = shell_blocking_capture_combined({ "env", "TS_RUNROOT=" .. path_join(config["etc_dir"], "trafficserver/runroot.yaml"), "traffic_ctl", "config", "reload" })
   if err then
     print("Failed to reload trafficserver\n" .. err)
     os.exit(1)

tasks/deps/trafficserver

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-trafficserver_version="10.0.2"
-trafficserver_hash="5de65130d4c0997d619d0c1be6840aaffd3e17abd820d22b9294c4d78834eb71a58fed12f3166396c7169583850a8b42ed768e5af11e855c87b2fca8a10da7f3"
+trafficserver_version="10.1.0"
+trafficserver_hash="836cac33f6a54be2b62eaa881b333d16a6029177f3ce788fce3eec7d097843bbbd49bb9a748d6ec6592d86e6d425975f6a9b462401ab808e1e4f0726488eb2b8"
 
 set -e -u -x
 source ./tasks/helpers.sh

tasks/outdated.thor

@@ -88,7 +88,6 @@ class Outdated < Thor
     },
     "trafficserver" => {
       :http => "https://archive.apache.org/dist/trafficserver/",
-      :constraint => "~> 9.2.0",
       :checksums_download => "https://archive.apache.org/dist/trafficserver/trafficserver-<%= version.fetch(:wanted_version) %>.tar.bz2.sha512",
       :filename_matcher => /trafficserver.*\.tar\.bz2/,
     },

templates/etc/fluent-bit/fluent-bit.yaml.etlua

@@ -28,20 +28,6 @@ pipeline:
       format: json
       storage.type: filesystem
 
-    <% if config["log"]["destination"] == "console" then %>
-    # Workaround for error.log currently being hard-coded to output to a file
-    # that won't work if symlinked to /dev/stdout (it insists on rolling the file
-    # since it doesn't think it can write to it).
-    #
-    # This workaround should no longer be needed once Trafficserver 10 is
-    # released and things can be configured to output to stdout/stderr directly:
-    # https://github.com/apache/trafficserver/pull/7937
-    - name: tail
-      tag: trafficserver
-      path: <%- json_encode(path_join(config["log_dir"], "trafficserver/error.log")) %>
-      refresh_interval: 5
-    <% end %>
-
   filters:
     - name: rewrite_tag
       match: analytics.allowed

templates/etc/perp/trafficserver/rc.env.etlua

@@ -1,2 +1,2 @@
 LD_LIBRARY_PATH=<%- config["_embedded_root_dir"] %>/openresty/luajit/lib:<%- config["_embedded_root_dir"] %>/lib
-TS_ROOT=<%- config["root_dir"] %>
+TS_RUNROOT=<%- path_join(config["etc_dir"], "trafficserver/runroot.yaml") %>

templates/etc/trafficserver/records.yaml.etlua

@@ -6,21 +6,6 @@ records:
     # will handle switching the user).
     user_id: "#-1"
 
-  # Specify where to find the TrafficServer binaries, plugins, etc. Our config
-  # files are in a non-default location by using TS_ROOT (this is done so that
-  # the config files can co-exist with the rest of the API Umbrella config
-  # files, and so that we can relocate the location for running tests).
-  # Therefore, we must explicitly point back to the original TrafficServer
-  # install directory. This could potentially be made cleaner without the use
-  # of TS_ROOT with the new proxy.config.config_dir setting
-  # (https://issues.apache.org/jira/browse/TS-3192), but I wasn't able to get
-  # that to quite work properly.
-  bin_path: <%- json_encode(path_join(config["_embedded_root_dir"], "bin")) %>
-  body_factory:
-    template_sets_dir: <%- json_encode(path_join(config["_embedded_root_dir"], "etc/trafficserver/body_factory")) %>
-  plugin:
-    plugin_dir: <%- json_encode(path_join(config["_embedded_root_dir"], "libexec/trafficserver")) %>
-
   output:
     logfile:
       name: <%- json_encode(config["log"]["destination"] == "console" and "stdout" or "traffic.out") %>
@@ -34,11 +19,6 @@ records:
     logfile:
       filename: <%- json_encode(config["log"]["destination"] == "console" and "stdout" or "diags.log") %>
 
-      # Disable Trafficserver's own log file rotation for these files. We'll
-      # either output to stdout or rotate log files with logrotate (to be
-      # consistent with all the other API Umbrella components).
-      rolling_enabled: 0
-
     # Log all diagnostic output to stderr (instead of also shipping it to the
     # system-wide syslog).
     output:
@@ -53,19 +33,15 @@ records:
       warning: E
 
     # Enable for debug logging.
-    debug:
-      enabled: 1
-      # tags: ".*"
-      tags: "http_hdrs|http_tproxy|http_trans"
+    # debug:
+    #   enabled: 1
+    #   tags: ".*"
 
   error:
     logfile:
       filename: <%- json_encode(config["log"]["destination"] == "console" and "stderr" or "error.log") %>
 
   log:
-    # Log to the standard API Umbrella log directory location.
-    logfile_dir: <%- json_encode(path_join(config["log_dir"], "trafficserver")) %>
-
     # Allow longer lines in logging.
     ascii_buffer_size: 24576
     log_buffer_size: 24576
@@ -93,11 +69,6 @@ records:
     sock_option_flag_out: 3
 
   http:
-    # request_buffer_enabled: 0
-    # post_copy_size: 100M
-    # keep_alive_post_out: 0
-    # max_post_size: "1000000"
-
     server_ports: <%- json_encode(config["trafficserver"]["port"]) %>
 
     # Increase timeouts to match the timeouts in other pieces of the stack.

templates/etc/trafficserver/runroot.yaml.etlua

@@ -0,0 +1,7 @@
+prefix: <%- json_encode(path_join(config["_embedded_root_dir"])) %>
+sysconfdir: <%- json_encode(path_join(config["etc_dir"], "trafficserver")) %>
+localstatedir: <%- json_encode(path_join(config["var_dir"], "trafficserver")) %>
+runtimedir: <%- json_encode(path_join(config["var_dir"], "trafficserver")) %>
+logdir: <%- json_encode(path_join(config["log_dir"], "trafficserver")) %>
+runtimedir: <%- json_encode(path_join(config["var_dir"], "trafficserver")) %>
+cachedir: <%- json_encode(path_join(config["var_dir"], "trafficserver")) %>

templates/etc/trafficserver/storage.config.etlua

@@ -1 +1 @@
-var/trafficserver <%- config["trafficserver"]["storage"]["size"] %>
+<%- path_join(config["var_dir"], "trafficserver") %> <%- config["trafficserver"]["storage"]["size"] %>

test/apis/test_web_app_large_body.rb

@@ -51,14 +51,10 @@ def test_fails_with_large_body_above_default_limit
     assert_operator(body.bytesize, :>, 1 * 1024 * 1024) # 1MB
     assert_operator(body.bytesize, :<, 1.1 * 1024 * 1024) # 1.1MB
 
-    response = nil
-    100.times do
-      response = Typhoeus.post("https://127.0.0.1:9081/api-umbrella/v1/users/#{user.id}.json", http_options.deep_merge(admin_token).deep_merge({
-        :headers => { "Content-Type" => "application/json" },
-        :body => body,
-      }))
-      ap response.code
-    end
+    response = Typhoeus.post("https://127.0.0.1:9081/api-umbrella/v1/users/#{user.id}.json", http_options.deep_merge(admin_token).deep_merge({
+      :headers => { "Content-Type" => "application/json" },
+      :body => body,
+    }))
     assert_above_max_body_size(response)
 
     user.reload