Hostdb restructure merged with master

.asf.yaml

@@ -33,7 +33,7 @@ github:
         strict: false
         contexts:
           - AuTest
-          - CentOS
+          - Rocky
           - Clang-Analyzer
           - Clang-Format
           - Debian

build/hiredis.m4

@@ -34,7 +34,7 @@ AC_ARG_WITH(hiredis, [AS_HELP_STRING([--with-hiredis=DIR],[use a specific hiredi
 
 case "$hiredis_base_dir" in
 *":"*)
-  hidredis_include="`echo $hiredis_base_dir |sed -e 's/:.*$//'`"
+  hiredis_include="`echo $hiredis_base_dir |sed -e 's/:.*$//'`"
   hiredis_ldflags="`echo $hiredis_base_dir |sed -e 's/^.*://'`"
   AC_MSG_CHECKING(for hiredis includes in $hiredis_include libs in $hiredis_ldflags )
   ;;

build/libswoc.m4

@@ -0,0 +1,97 @@
+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 libswoc.m4: Trafficserver's libswoc autoconf macros
+dnl
+
+dnl
+dnl TS_CHECK_LIBSWOC: look for libswoc libraries and headers
+dnl
+AC_DEFUN([TS_CHECK_LIBSWOC], [
+has_libswoc=no
+AC_ARG_WITH(libswoc, [AS_HELP_STRING([--with-libswoc=DIR],[use a specific libswoc library])],
+[
+  if test "x$withval" != "xyes" && test "x$withval" != "x"; then
+    libswoc_base_dir="$withval"
+    if test "$withval" != "no"; then
+      has_libswoc=yes
+      case "$withval" in
+      *":"*)
+        swoc_include="`echo $withval |sed -e 's/:.*$//'`"
+        swoc_ldflags="`echo $withval |sed -e 's/^.*://'`"
+        AC_MSG_CHECKING(checking for libswoc includes in $swoc_include libs in $swoc_ldflags )
+        ;;
+      *)
+        swoc_include="$withval/include"
+        swoc_ldflags="$withval/lib"
+        libswoc_base_dir="$withval"
+        AC_MSG_CHECKING(libswoc includes in $withval libs in $swoc_ldflags)
+        ;;
+      esac
+    fi
+  fi
+
+  if test -d $swoc_include && test -d $swoc_ldflags && test -f $swoc_include/libswoc/yaml.h; then
+    AC_MSG_RESULT([ok])
+  else
+    AC_MSG_RESULT([not found])
+  fi
+
+if test "$has_libswoc" != "no"; then
+  saved_ldflags=$LDFLAGS
+  saved_cppflags=$CPPFLAGS
+
+  SWOC_LIBS=-lswoc
+  if test "$libswoc_base_dir" != "/usr"; then
+    SWOC_INCLUDES=-I${swoc_include}
+    SWOC_LDFLAGS=-L${swoc_ldflags}
+
+    TS_ADDTO_RPATH(${swoc_ldflags})
+  fi
+
+  if test "$swoc_include" != "0"; then
+    SWOC_INCLUDES=-I${swoc_include}
+  else
+    has_libswoc=no
+    CPPFLAGS=$saved_cppflags
+    LDFLAGS=$saved_ldflags
+  fi
+fi
+],
+[
+  has_libswoc=no
+  SWOC_INCLUDES=-I\${abs_top_srcdir}/lib/swoc/include
+  SWOC_LIBS=-lswoc
+  SWOC_LDFLAGS=-L\${abs_top_builddir}/lib/swoc
+])
+
+AC_SUBST([SWOC_INCLUDES])
+AC_SUBST([SWOC_LIBS])
+AC_SUBST([SWOC_LDFLAGS])
+
+])
+
+dnl TS_CHECK_SWOC: check if we want to export libswoc headers from trafficserver. default: not exported
+AC_DEFUN([TS_CHECK_SWOC_HEADERS_EXPORT], [
+AC_MSG_CHECKING([whether to export libswoc headers])
+AC_ARG_ENABLE([swoc-headers],
+  [AS_HELP_STRING([--enable-swoc-headers],[Export libswoc headers])],
+  [],
+  [enable_swoc_headers=no]
+)
+AC_MSG_RESULT([$enable_swoc_headers])
+])

build/nuraft.m4

@@ -0,0 +1,85 @@
+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 nuraft.m4: Trafficserver's nuraft autoconf macros
+dnl
+
+dnl
+dnl TS_CHECK_NURAFT: look for nuraft libraries and headers
+dnl
+
+AC_DEFUN([TS_CHECK_NURAFT], [
+has_nuraft=no
+AC_ARG_WITH(nuraft, [AC_HELP_STRING([--with-nuraft=DIR], [use a specific nuraft library])],
+[
+  if test "x$withval" != "xyes" && test "x$withval" != "x"; then
+    nuraft_base_dir="$withval"
+    if test "$withval" != "no"; then
+      has_nuraft=yes
+      case "$withval" in
+      *":"*)
+        nuraft_include="`echo $withval | sed -e 's/:.*$//'`"
+        nuraft_ldflags="`echo $withval | sed -e 's/^.*://'`"
+        AC_MSG_CHECKING(for nuraft includes in $nuraft_include libs in $nuraft_ldflags)
+        ;;
+      *)
+        nuraft_include="$withval/include"
+        nuraft_ldflags="$withval/lib"
+        nuraft_base_dir="$withval"
+        AC_MSG_CHECKING(for nuraft includes in $nuraft_include libs in $nuraft_ldflags)
+        ;;
+      esac
+    fi
+  fi
+
+  if test -d $nuraft_include && test -d $nuraft_ldflags && test -f $nuraft_include/libnuraft/nuraft.hxx; then
+    AC_MSG_RESULT([ok])
+  else
+    AC_MSG_RESULT([not found])
+  fi
+
+if test "$has_nuraft" != "no"; then
+  saved_ldflags=$LDFLAGS
+  saved_cppflags=$CPPFLAGS
+
+  NURAFT_LIBS=-lnuraft
+  if test "$nuraft_base_dir" != "/usr"; then
+    NURAFT_INCLUDES=-I${nuraft_include}
+    NURAFT_LDFLAGS=-L${nuraft_ldflags}
+
+    TS_ADDTO(CPPFLAGS, [${NURAFT_INCLUDES}])
+    TS_ADDTO(LDFLAGS, [${NURAFT_LDFLAGS}])
+    TS_ADDTO_RPATH(${nuraft_ldflags})
+  fi
+
+  if test "$nuraft_include" != "0"; then
+    NURAFT_INCLUDES=-I${nuraft_include}
+  else
+    has_nuraft=no
+    CPPFLAGS=$saved_cppflags
+    LDFLAGS=$saved_ldflags
+  fi
+fi
+],
+[
+  has_nuraft=no
+])
+
+AC_SUBST([NURAFT_INCLUDES])
+AC_SUBST([NURAFT_LIBS])
+AC_SUBST([NURAFT_LDFLAGS])
+])

configs/body_factory/default/Makefile.am

@@ -28,6 +28,7 @@ dist_bodyfactory_DATA = \
 	connect\#dns_failed \
 	connect\#failed_connect \
 	connect\#hangup \
+	connect\#all_dead \
 	default \
 	interception\#no_host \
 	README \

configs/body_factory/default/connect#all_dead

@@ -0,0 +1,17 @@
+<HTML>
+<HEAD>
+<TITLE>No Valid Host</TITLE>
+</HEAD>
+
+<BODY BGCOLOR="white" FGCOLOR="black">
+<H1>No Valid Host</H1>
+<HR>
+
+<FONT FACE="Helvetica,Arial"><B>
+Description: Unable to find a valid target host.
+
+The server was found but all of the addresses are marked dead and so there is
+no valid target address to which to connect. Please try again after a few minutes.
+</B></FONT>
+<HR>
+</BODY>

configure.ac

@@ -175,6 +175,13 @@ AC_ARG_ENABLE([all-asserts],
 )
 AC_MSG_RESULT([$enable_all_asserts])
 
+AC_MSG_CHECKING([whether to enable event tracker])
+AC_ARG_ENABLE([event-tracker],
+  [AS_HELP_STRING([--enable-event-tracker],[turn on event tracker])],
+  [],
+  [enable_event_tracker=no]
+)
+AC_MSG_RESULT([$enable_event_tracker])
 
 # Enable code coverage instrumentation only if requested by the user.
 AC_MSG_CHECKING([whether to code coverage])
@@ -856,7 +863,7 @@ case $host_os_def in
       common_opt="-pipe -Wall -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-format-truncation -Wno-cast-function-type -Wno-stringop-overflow"
       debug_opt="-ggdb3 $common_opt"
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
-      cxx_opt="-Wno-invalid-offsetof -Wno-noexcept-type"
+      cxx_opt="-Wno-invalid-offsetof -Wno-noexcept-type -Wsuggest-override"
       # Special options for flex generated .c files
       flex_cflags="-Wno-unused-parameter"
     ])
@@ -897,7 +904,7 @@ case $host_os_def in
       common_opt="-pipe -Wall -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter"
       debug_opt="-ggdb3 $common_opt"
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
-      cxx_opt="-Wno-invalid-offsetof"
+      cxx_opt="-Wno-invalid-offsetof -Wsuggest-override"
     ])
 
     AS_IF([test -d /usr/local/lib], [
@@ -975,10 +982,15 @@ fi
 if test "x${enable_mime_sanity_check}" = "xyes"; then
   TS_ADDTO(AM_CPPFLAGS, [-DENABLE_MIME_SANITY_CHECK])
 fi
+
 if test "x${enable_all_asserts}" = "xyes"; then
   TS_ADDTO(AM_CPPFLAGS, [-DENABLE_ALL_ASSERTS])
 fi
 
+if test "x${enable_event_tracker}" = "xyes"; then
+  TS_ADDTO(AM_CPPFLAGS, [-DENABLE_EVENT_TRACKER])
+fi
+
 # Flags for ASAN
 if test "x${enable_asan}" = "xyes"; then
   if test "x${enable_tsan}" = "xyes" -o "x${enable_tsan}" = "xstatic"; then
@@ -1446,14 +1458,23 @@ AM_CONDITIONAL([BUILD_YAML_CPP], [test x"$has_yaml_cpp" = x"no"])
 TS_CHECK_YAML_HEADERS_EXPORT
 AM_CONDITIONAL([EXPORT_YAML_HEADERS], [test x"$enable_yaml_headers" = x"yes"])
 
+TS_CHECK_LIBSWOC
+AM_CONDITIONAL([BUILD_SWOC], [test x"$has_libswoc" = x"no"])
+
+TS_CHECK_SWOC_HEADERS_EXPORT
+AM_CONDITIONAL([EXPORT_SWOC_HEADER], [test x"$enable_swoc_headers" = x"yes"])
+
 # Check for optional boringocsp library
 TS_CHECK_BORINGOCSP
 
 # Check for optional hiredis library
 TS_CHECK_HIREDIS
-
 AM_CONDITIONAL([BUILD_SSL_SESSION_REUSE_PLUGIN], [test ! -z "${LIB_HIREDIS}" -a "x${has_hiredis}" = "x1" ])
 
+# Check for optional nuraft library
+TS_CHECK_NURAFT
+AM_CONDITIONAL([BUILD_STEK_SHARE_PLUGIN], [test x"$has_nuraft" = x"yes"])
+
 # Check for backtrace() support
 has_backtrace=0
 AC_CHECK_HEADERS([execinfo.h], [has_backtrace=1],[])
@@ -2312,13 +2333,15 @@ AC_MSG_NOTICE([Build option summary:
     CXXFLAGS:           $CXXFLAGS
     CPPFLAGS:           $CPPFLAGS
     LDFLAGS:            $LDFLAGS
-    AM@&t@_CFLAGS:          $AM_CFLAGS
-    AM@&t@_CXXFLAGS:        $AM_CXXFLAGS
-    AM@&t@_CPPFLAGS:        $AM_CPPFLAGS
-    AM@&t@_LDFLAGS:         $AM_LDFLAGS
+    AM@&t@_CFLAGS:      $AM_CFLAGS
+    AM@&t@_CXXFLAGS:    $AM_CXXFLAGS
+    AM@&t@_CPPFLAGS:    $AM_CPPFLAGS
+    AM@&t@_LDFLAGS:     $AM_LDFLAGS
     TS_INCLUDES:        $TS_INCLUDES
     OPENSSL_LDFLAGS:    $OPENSSL_LDFLAGS
     OPENSSL_INCLUDES:   $OPENSSL_INCLUDES
     YAMLCPP_LDFLAGS:    $YAMLCPP_LDFLAGS
     YAMLCPP_INCLUDES:   $YAMLCPP_INCLUDES
+    NURAFT_LDFLAGS:     $NURAFT_LDFLAGS
+    NURAFT_INCLUDES:    $NURAFT_INCLUDES
 ])

doc/Pipfile

@@ -23,15 +23,17 @@ verify_ssl = true
 
 [packages]
 
-# The latest 4.x sphinx release, currently 4.0.2, fails `make html`.  For
-# details, see: https://github.com/apache/trafficserver/issues/7938
-#
-# The 3.x releases build fine, however. So we currently pin to that.
+# The latest 4.x sphinx release has issues with style rendering. The 3.x
+# releases build and render fine, however. So we currently pin to that.
 #
 # Once that issue, either with sphinx or our docs, is resolved, then we should
 # unpin sphinx by setting the following to "*".
 sphinx = "==3.*"
 
+# Sphinx 3.x builds break with the latest jinja2. This jinja2 pin can be
+# removed when we move to Sphinx 4.x.
+jinja2 = "<3.1"
+
 sphinx-rtd-theme = "*"
 sphinxcontrib-plantuml = "*"
 # i18n

doc/admin-guide/files/parent.config.en.rst

@@ -222,6 +222,7 @@ The following list shows the possible actions and their allowed values.
       parent is marked down and a new parent is selected to retry the request.  The number of
       retries is controlled by ``max_unavailable_server_retries`` which is set to 1 by default.
     - ``both`` - This enables both ``simple_retry`` and ``unavailable_server_retry`` as described above.
+    - If not set, by default all response codes will be considered a success, and parents will not be retried based on any HTTP response code.
 
     .. Note::
 
@@ -270,7 +271,7 @@ The following list shows the possible actions and their allowed values.
     -  ``strict`` - Traffic Server machines serve requests strictly in
        turn. For example: machine ``proxy1`` serves the first request,
        ``proxy2`` serves the second request, and so on.
-    -  ``false`` - Round robin selection does not occur.
+    -  ``false`` - The default. Round robin selection does not occur.
     -  ``consistent_hash`` - consistent hash of the url so that one parent
        is chosen for a given url. If a parent is down, the traffic that
        would go to the down parent is rehashed amongst the remaining parents.
@@ -290,7 +291,7 @@ The following list shows the possible actions and their allowed values.
 ``go_direct``
     One of the following values:
 
-    -  ``true`` - requests bypass parent hierarchies and go directly to
+    -  ``true`` - The default. Requests bypass parent hierarchies and go directly to
        the origin server.
 
     -  ``false`` - requests do not bypass parent hierarchies.
@@ -300,7 +301,7 @@ The following list shows the possible actions and their allowed values.
 ``qstring``
     One of the following values:
 
-    -  ``consider`` - Use the query string when finding a parent.
+    -  ``consider`` - The default. Use the query string when finding a parent.
 
     -  ``ignore`` - Do not consider the query string when finding a parent. This
        is especially useful when using the ``consistent_hash`` selection strategy,