Merge 10 dev into master

.gitignore

@@ -67,6 +67,7 @@ src/traffic_cache_tool/traffic_cache_tool
 src/traffic_cop/traffic_cop
 src/traffic_crashlog/traffic_crashlog
 src/traffic_ctl/traffic_ctl
+src/traffic_ctl_jsonrpc/traffic_ctl
 src/traffic_layout/traffic_layout
 src/traffic_logcat/traffic_logcat
 src/traffic_logstats/traffic_logstats
@@ -155,6 +156,7 @@ plugins/esi/vars_test
 
 plugins/experimental/uri_signing/test_uri_signing
 
+mgmt/rpc/overridable_txn_vars.cc
 mgmt/api/traffic_api_cli_remote
 mgmt/tools/traffic_mcast_snoop
 mgmt/tools/traffic_net_config
@@ -204,6 +206,7 @@ tools/escape_mapper/escape_mapper
 BUILDS
 DEBUG
 RELEASE
+cmake-build-*
 
 # lcov generated files.
 *.gcda

.vscode/launch.json

@@ -19,25 +19,6 @@
                     "ignoreFailures": true
                 }
             ]
-        },
-        {
-            "name": "(gdb) traffic_manager",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/${env:ATS_VSCODE_BUILDDIR}/src/traffic_manager/.libs/traffic_manager",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
         }
     ]
 }

CMakeLists.txt

@@ -32,6 +32,7 @@ include_directories(
         include
         tests/include
         lib
+        lib/swoc/include
         lib/yamlcpp/include
         proxy
         proxy/hdrs
@@ -72,7 +73,6 @@ CC_EXEC(traffic_ctl src/traffic_ctl)
 CC_EXEC(traffic_layout src/traffic_layout)
 CC_EXEC(traffic_logcat src/traffic_logcat)
 CC_EXEC(traffic_logstats src/traffic_logstats)
-CC_EXEC(traffic_manager src/traffic_manager)
 CC_EXEC(traffic_server src/traffic_server)
 target_sources(traffic_server PRIVATE src/shared/overridable_txn_vars.cc)
 CC_EXEC(traffic_top src/traffic_top)

README.md

@@ -42,10 +42,10 @@ trafficserver ............. Top src dir
 │   │   └── quic .......... QUIC implementation
 │   └── utils ............. Utilities
 ├── lib ...................
-│   ├── perl .............. Perl libraries for e.g. mgmt access and configurations
+│   ├── perl .............. Perl libraries for configurations
 │   ├── records ........... Library for config files
 │   └── yamlcpp ........... Library for YAML of C++
-├── mgmt .................. Management server and tools
+├── mgmt .................. JSONRPC server/management and tools
 ├── plugins ............... Stable core plugins
 │   └── experimental ...... Experimental core plugins
 ├── proxy ................. HTTP proxy logic
@@ -63,7 +63,6 @@ trafficserver ............. Top src dir
 │   ├── traffic_layout .... Display information on the build and runtime directory structure
 │   ├── traffic_logcat .... Convert binary log file to plain text
 │   ├── traffic_logstats .. Log parsing and metrics calculation utility
-│   ├── traffic_manager ... The manager process for Traffic Server
 │   ├── traffic_server .... Main proxy server
 │   ├── traffic_top ....... Top like tool for viewing Traffic Server statistics
 │   ├── traffic_via ....... Tool for decoding the Traffic Server Via header codes
@@ -90,8 +89,7 @@ trafficserver ............. Top src dir
 
   <https://cwiki.apache.org/confluence/display/TS/Building>.
 
-  As of ATS v7.0.0 and later, gcc 4.8.1 or later is required, since we now use
-  and require the C++11 standard.
+  As of ATS v9.0.0 and later, gcc 7 or later is required, since we now use and require the C++17 standard.
 
 ### Fedora / CentOS / RHEL:
 ```

build/libswoc.m4

@@ -55,7 +55,7 @@ if test "$has_libswoc" != "no"; then
   saved_ldflags=$LDFLAGS
   saved_cppflags=$CPPFLAGS
 
-  SWOC_LIBS=-lswoc
+  SWOC_LIBS=-ltsswoc
   if test "$libswoc_base_dir" != "/usr"; then
     SWOC_INCLUDES=-I${swoc_include}
     SWOC_LDFLAGS=-L${swoc_ldflags}
@@ -75,7 +75,7 @@ fi
 [
   has_libswoc=no
   SWOC_INCLUDES=-I\${abs_top_srcdir}/lib/swoc/include
-  SWOC_LIBS=-lswoc
+  SWOC_LIBS=-ltsswoc
   SWOC_LDFLAGS=-L\${abs_top_builddir}/lib/swoc
 ])
 

build/plugins.mk

@@ -26,7 +26,8 @@ TS_PLUGIN_LD_FLAGS = \
 
 TS_PLUGIN_CPPFLAGS = \
   -I$(abs_top_srcdir)/include \
-  -I$(abs_top_srcdir)/lib
+  -I$(abs_top_srcdir)/lib \
+  @SWOC_INCLUDES@
 
 # Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
 # throws an error if we try to do the same with AM_LDFLAGS. Hence, we provide

build/quiche.m4

@@ -0,0 +1,88 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl quiche.m4: Trafficserver's quiche autoconf macros
+dnl
+
+dnl
+dnl TS_CHECK_QUICHE: look for quiche libraries and headers
+dnl
+AC_DEFUN([TS_CHECK_QUICHE], [
+has_quiche=0
+AC_ARG_WITH(quiche, [AS_HELP_STRING([--with-quiche=DIR],[use a specific quiche library])],
+[
+  if test "x$withval" != "xyes" && test "x$withval" != "x"; then
+    quiche_base_dir="$withval"
+    if test "$withval" != "no"; then
+      has_quiche=1
+      case "$withval" in
+      *":"*)
+        quiche_include="`echo $withval | sed -e 's/:.*$//'`"
+        quiche_ldflags="`echo $withval | sed -e 's/^.*://'`"
+        AC_MSG_CHECKING(checking for quiche includes in $quiche_include libs in $quiche_ldflags )
+        ;;
+      *)
+        quiche_include="$withval/include"
+        quiche_ldflags="$withval/lib"
+        AC_MSG_CHECKING(checking for quiche includes in $withval)
+        ;;
+      esac
+    fi
+  fi
+
+  if test -d $quiche_include && test -d $quiche_ldflags && test -f $quiche_include/quiche.h; then
+    AC_MSG_RESULT([ok])
+  else
+    AC_MSG_RESULT([not found])
+  fi
+
+if test "$has_quiche" != "0"; then
+  saved_ldflags=$LDFLAGS
+  saved_cppflags=$CPPFLAGS
+  saved_libs=$LIBS
+  quiche_have_headers=0
+  quiche_have_libs=0
+  if test "$quiche_base_dir" != "/usr"; then
+    TS_ADDTO(CPPFLAGS, [-I${quiche_include}])
+    TS_ADDTO(LDFLAGS, [-L${quiche_ldflags}])
+    TS_ADDTO(LIBS, [-lquiche])
+    TS_ADDTO_RPATH(${quiche_ldflags})
+  fi
+
+  AC_CHECK_LIB([quiche], quiche_connect, [quiche_have_libs=1])
+  if test "$quiche_have_libs" != "0"; then
+    AC_CHECK_HEADERS(quiche.h, [quiche_have_headers=1])
+  fi
+  if test "$quiche_have_headers" != "0"; then
+    AC_SUBST([QUICHE_LIB], [-lquiche])
+    AC_SUBST([QUICHE_CFLAGS], [-I${quiche_include}])
+    AC_CHECK_FUNCS([quiche_config_set_active_connection_id_limit])
+  else
+    has_quiche=0
+    CPPFLAGS=$saved_cppflags
+    LDFLAGS=$saved_ldflags
+    LIBS=$saved_libs
+  fi
+fi
+],
+[
+AC_CHECK_HEADER([quiche.h], [], [has_quiche=0])
+AC_CHECK_LIB([quiche], quiche_connect, [:], [has_quiche=0])
+])
+
+AM_CONDITIONAL([USE_QUICHE], [test $has_quiche -eq 1])
+])

build/yaml-cpp.m4

@@ -82,6 +82,7 @@ fi
 AC_SUBST([YAMLCPP_INCLUDES])
 AC_SUBST([YAMLCPP_LIBS])
 AC_SUBST([YAMLCPP_LDFLAGS])
+AC_DEFINE([YAMLCPP_LIB_VERSION], ["0.7.0"], [yamlcpp library version])
 
 ])
 

ci/jenkins/ats_conf.pl

@@ -27,7 +27,6 @@
 
 $recedit->append(line => "");
 $recedit->append(line => "# My local stuff");
-$recedit->append(line => "CONFIG proxy.config.proxy_binary_opts STRING -M --disable_freelist");
 #$recedit->append(line => "CONFIG proxy.config.crash_log_helper STRING /home/admin/bin/invoker_wrap.sh");
 
 # Port setup

configs/Makefile.am

@@ -39,7 +39,8 @@ dist_sysconf_DATA =	\
 	splitdns.config.default \
 	ssl_multicert.config.default \
 	strategies.yaml.default \
-	volume.config.default
+	volume.config.default \
+	jsonrpc.yaml.default
 
 install-exec-hook:
 	for dfltcfgfile in $(dist_sysconf_DATA) $(nodist_sysconf_DATA) ; \

configs/jsonrpc.yaml.default

@@ -0,0 +1,14 @@
+# jsonrpc.yaml
+#
+# Documentation:
+#   https://docs.trafficserver.apache.org/en/latest/admin-guide/files/jsonrpc.yaml.en.html
+#
+# This configuration file can be used to configure some specific values of
+# the jsonrpc endpoint.
+#
+# Example:
+
+# rpc:
+#   enabled: true
+#   unix:
+#      restricted_api: true

configs/logging.yaml.default

@@ -19,16 +19,16 @@ logging:
     # reporting tools, simply create a log that uses this format.
     - name: welf
       format: |-
-          id=firewall time="%<cqtd> %<cqtt>" fw=%<phn> pri=6 proto=%<cqus> duration=%<ttmsf> sent=%<psql> rcvd=%<cqhl> src=%<chi> dst=%<shi> dstname=%<shn> user=%<caun> op=%<cqhm> arg="%<cqup>" result=%<pssc> ref="%<{Referer}cqh>" agent="%<{user-agent}cqh>" cache=%<crc>
+          id=firewall time="%<cqtd> %<cqtt>" fw=%<phn> pri=6 proto=%<pqus> duration=%<ttmsf> sent=%<psql> rcvd=%<cqhl> src=%<chi> dst=%<shi> dstname=%<shn> user=%<caun> op=%<cqhm> arg="%<pqup>" result=%<pssc> ref="%<{Referer}cqh>" agent="%<{user-agent}cqh>" cache=%<crc>
     # Squid Log Format with seconds resolution timestamp.
     # The following is the squid format but with a seconds-only timestamp
     # (cqts) instead of a seconds and milliseconds timestamp (cqtq).
     - name: squid_seconds_only_timestamp
-      format: '%<cqts> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>'
+      format: '%<cqts> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<pquc> %<caun> %<phr>/%<shn> %<psct>'
 
     # Squid Log Format.
     - name: squid
-      format: '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>'
+      format: '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<pquc> %<caun> %<phr>/%<shn> %<psct>'
 
     # Common Log Format.
     - name: common

configs/records.config.default.in

@@ -35,7 +35,6 @@ CONFIG proxy.config.http.insert_response_via_str INT 0
 #    https://docs.trafficserver.apache.org/en/latest/admin-guide/files/parent.config.en.html
 ##############################################################################
 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
 CONFIG proxy.config.http.uncacheable_requests_bypass_parent INT 1
 
@@ -60,7 +59,6 @@ CONFIG proxy.config.http.connect_attempts_max_retries INT 3
 CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 1
 CONFIG proxy.config.http.connect_attempts_rr_retries INT 3
 CONFIG proxy.config.http.connect_attempts_timeout INT 30
-CONFIG proxy.config.http.post_connect_attempts_timeout INT 1800
 CONFIG proxy.config.http.down_server.cache_time INT 60
 
 ##############################################################################

configure.ac

@@ -547,14 +547,13 @@ AM_CONDITIONAL([BUILD_IMAGE_MAGICK_PLUGINS], [test "x${enable_image_magick_plugi
 
 AC_MSG_CHECKING([whether to install example plugins])
 AC_ARG_ENABLE([example-plugins],
-  [AS_HELP_STRING([--enable-example-plugins],[build and install example plugins])],
+  [AS_HELP_STRING([--enable-example-plugins],[Build and install example plugins])],
   [],
   [enable_example_plugins=no]
 )
 AC_MSG_RESULT([$enable_example_plugins])
 AM_CONDITIONAL([BUILD_EXAMPLE_PLUGINS], [ test "x${enable_example_plugins}" = "xyes" ])
 
-
 #
 # Test tools. The test tools are always built, but not always installed. Installing
 # them is useful for QA, but not useful for most users, so we default this to disabled.
@@ -1402,6 +1401,7 @@ AC_CHECK_FUNCS([clock_gettime kqueue epoll_ctl posix_fadvise posix_madvise posix
 AC_CHECK_FUNCS([port_create strlcpy strlcat sysconf sysctlbyname getpagesize])
 AC_CHECK_FUNCS([getreuid getresuid getresgid setreuid setresuid getpeereid getpeerucred])
 AC_CHECK_FUNCS([strsignal psignal psiginfo accept4])
+AC_CHECK_FUNCS([sendmmsg])
 
 # Check for eventfd() and sys/eventfd.h (both must exist ...)
 AC_CHECK_HEADERS([sys/eventfd.h], [
@@ -1437,6 +1437,16 @@ TS_CHECK_BROTLI
 # Check for optional luajit library
 TS_CHECK_LUAJIT
 
+# Check for optional quiche library
+TS_CHECK_QUICHE
+if test "${has_quiche}" = "1"; then
+enable_quic=yes
+## Doing these again for Quiche
+AM_CONDITIONAL([ENABLE_QUIC], [test "x$enable_quic" = "xyes"])
+TS_ARG_ENABLE_VAR([use], [quic])
+AC_SUBST(use_quic)
+fi
+
 # Check for optional WAVM library
 TS_CHECK_WAVM
 
@@ -1887,11 +1897,6 @@ AM_CONDITIONAL([BUILD_HTTP_LOAD], [test x"$ac_cv_func_epoll_ctl" = x"yes"])
 # We should only build traffic_top if we have curses
 AM_CONDITIONAL([BUILD_TRAFFIC_TOP], [test "x$ax_cv_curses" = "xyes"])
 
-AC_CHECK_HEADERS([mysql/mysql.h], [has_mysql=1],[has_mysql=0])
-AC_CHECK_LIB([mysqlclient],[mysql_info],[AC_SUBST([LIB_MYSQLCLIENT],["-lmysqlclient"])],[has_mysql=0])
-AC_SUBST(has_mysql)
-AM_CONDITIONAL([HAS_MYSQL], [ test "x${has_mysql}" = "x1" ])
-
 AC_CHECK_HEADERS([kclangc.h], [
   AC_CHECK_LIB([kyotocabinet], [kcdbopen], [
     AC_SUBST([LIB_KYOTOCABINET], ["-lkyotocabinet"])
@@ -2377,6 +2382,8 @@ AC_CONFIG_FILES([
   mgmt/api/Makefile
   mgmt/api/include/Makefile
   mgmt/utils/Makefile
+  mgmt/rpc/Makefile
+  mgmt/config/Makefile
   plugins/Makefile
   proxy/Makefile
   proxy/hdrs/Makefile

contrib/install_trafficserver.sh

@@ -66,7 +66,6 @@ SLACKWARE="slackware"
 
 function killAll() {
     killall traffic_cop
-    killall traffic_manager
     killall traffic_server
 }
 

doc/.tx/config

@@ -427,11 +427,6 @@ file_filter = locale/<lang>/LC_MESSAGES/admin-guide/plugins/mp4.en.po
 source_file = _build/locale/pot/admin-guide/plugins/mp4.en.pot
 source_lang = en
 
-[apache-traffic-server-6x.admin-guide--plugins--mysql_remap_en]
-file_filter = locale/<lang>/LC_MESSAGES/admin-guide/plugins/mysql_remap.en.po
-source_file = _build/locale/pot/admin-guide/plugins/mysql_remap.en.pot
-source_lang = en
-
 [apache-traffic-server-6x.admin-guide--plugins--regex_remap_en]
 file_filter = locale/<lang>/LC_MESSAGES/admin-guide/plugins/regex_remap.en.po
 source_file = _build/locale/pot/admin-guide/plugins/regex_remap.en.pot
@@ -697,9 +692,9 @@ file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSContMute
 source_file = _build/locale/pot/developer-guide/api/functions/TSContMutexGet.en.pot
 source_lang = en
 
-[apache-traffic-server-6x.developer-guide--api--functions--TSContSchedule_en]
-file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSContSchedule.en.po
-source_file = _build/locale/pot/developer-guide/api/functions/TSContSchedule.en.pot
+[apache-traffic-server-6x.developer-guide--api--functions--TSContScheduleOnPool_en]
+file_filter = locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSContScheduleOnPool.en.po
+source_file = _build/locale/pot/developer-guide/api/functions/TSContScheduleOnPool.en.pot
 source_lang = en
 
 [apache-traffic-server-6x.developer-guide--api--functions--TSDebug_en]