HTTP/2 backports for 8.1.x (part 1)

.gitignore

@@ -97,8 +97,9 @@ iocore/eventsystem/test_MIOBufferWriter
 iocore/hostdb/test_RefCountCache
 
 proxy/hdrs/test_mime
+proxy/hdrs/test_Huffmancode
+proxy/hdrs/test_XPACK
 proxy/http/test_ForwardedConfig
-proxy/http2/test_Huffmancode
 proxy/http2/test_Http2DependencyTree
 proxy/http2/test_Http2FrequencyCounter
 proxy/http2/test_HPACK

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

@@ -2882,6 +2882,26 @@ Logging Configuration
    completion will cause its timing stats to be written to the :ts:cv:`debugging log file
    <proxy.config.output.logfile>`. This is identifying data about the transaction and all of the :c:type:`transaction milestones <TSMilestonesType>`.
 
+.. ts:cv:: CONFIG proxy.config.http2.connection.slow.log.threshold INT 0
+   :reloadable:
+   :units: milliseconds
+
+   If set to a non-zero value :arg:`N` then any HTTP/2 connection
+   that takes longer than :arg:`N` milliseconds from open to close will cause
+   its timing stats to be written to the :ts:cv:`debugging log file
+   <proxy.config.output.logfile>`. This is identifying data about the
+   transaction and all of the :c:type:`transaction milestones <TSMilestonesType>`.
+
+.. ts:cv:: CONFIG proxy.config.http2.stream.slow.log.threshold INT 0
+   :reloadable:
+   :units: milliseconds
+
+   If set to a non-zero value :arg:`N` then any HTTP/2 stream
+   that takes longer than :arg:`N` milliseconds from open to close will cause
+   its timing stats to be written to the :ts:cv:`debugging log file
+   <proxy.config.output.logfile>`. This is identifying data about the
+   transaction and all of the :c:type:`transaction milestones <TSMilestonesType>`.
+
 .. ts:cv:: CONFIG proxy.config.log.config.filename STRING logging.yaml
    :reloadable:
 
@@ -3507,7 +3527,15 @@ HTTP/2 Configuration
    :reloadable:
 
    The maximum size of the header compression table used to decode header
-   blocks.
+   blocks. This value will be advertised as SETTINGS_HEADER_TABLE_SIZE.
+
+.. ts:cv:: CONFIG proxy.config.http2.header_table_size_limit INT 65536
+   :reloadable:
+
+   The maximum size of the header compression table ATS actually use when ATS
+   encodes headers. Setting 0 means ATS doesn't insert headers into HPACK
+   Dynamic Table, however, headers still can be encoded as indexable
+   representations. The upper limit is 65536.
 
 .. ts:cv:: CONFIG proxy.config.http2.max_header_list_size INT 4294967295
    :reloadable:
@@ -3603,7 +3631,9 @@ HTTP/2 Configuration
 
    Specifies how many number of PRIORITY frames |TS| receives for a minute at maximum.
    Clients exceeded this limit will be immediately disconnected with an error
-   code of ENHANCE_YOUR_CALM.
+   code of ENHANCE_YOUR_CALM. If this is set to 0, the limit logic is disabled.
+   This limit only will be enforced if :ts:cv:`proxy.config.http2.stream_priority_enabled`
+   is set to 1.
 
 .. ts:cv:: CONFIG proxy.config.http2.min_avg_window_update FLOAT 2560.0
    :reloadable:

doc/admin-guide/monitoring/statistics/core/http-connection.en.rst

@@ -136,7 +136,111 @@ HTTP Connection
 
 This tracks the number of origin connections denied due to being over the :ts:cv:`proxy.config.http.origin_max_connections` limit.
 
-.. ts:stat:: global proxy.process.http2.current_active_client_connections integer
+
+HTTP/2
+------
+
+
+.. ts:stat:: global proxy.process.http2.total_client_connections integer
+   :type: counter
+
+   Represents the total number of HTTP/2 connections from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.current_client_connections integer
    :type: gauge
 
    Represents the current number of HTTP/2 connections from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.current_active_client_connections integer
+   :type: gauge
+
+   Represents the current number of HTTP/2 active connections from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.connection_errors integer
+   :type: counter
+
+   Represents the total number of HTTP/2 connections errors.
+
+.. ts:stat:: global proxy.process.http2.session_die_default integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   ``VC_EVENT_NONE`` event.
+
+.. ts:stat:: global proxy.process.http2.session_die_active integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   ``VC_EVENT_ACTIVE_TIMEOUT`` event.
+
+.. ts:stat:: global proxy.process.http2.session_die_inactive integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   ``VC_EVENT_INACTIVITY_TIMEOUT`` event.
+
+.. ts:stat:: global proxy.process.http2.session_die_eos integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   ``VC_EVENT_EOS`` event.
+
+.. ts:stat:: global proxy.process.http2.session_die_error integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   ``VC_EVENT_ERROR`` event.
+
+.. ts:stat:: global proxy.process.http2.session_die_other integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with
+   unknown event.
+
+.. ts:stat:: global proxy.process.http2.session_die_high_error_rate integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections with high
+   error rate which is configured by :ts:cv:`proxy.config.http2.stream_error_rate_threshold`.
+
+.. ts:stat:: global proxy.process.http2.max_settings_per_frame_exceeded integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for exceeding the
+   maximum allowed number of settings per frame limit which is configured by
+   :ts:cv:`proxy.config.http2.max_settings_per_frame`.
+
+.. ts:stat:: global proxy.process.http2.max_settings_per_minute_exceeded integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for exceeding the
+   maximum allowed number of settings per minute limit which is configured by
+   :ts:cv:`proxy.config.http2.max_settings_per_minute`.
+
+.. ts:stat:: global proxy.process.http2.max_settings_frames_per_minute_exceeded integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for exceeding the
+   maximum allowed number of settings frames per minute limit which is configured by
+   :ts:cv:`proxy.config.http2.max_settings_frames_per_minute`.
+
+.. ts:stat:: global proxy.process.http2.max_ping_frames_per_minute_exceeded integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for exceeding the
+   maximum allowed number of ping frames per minute limit which is configured by
+   :ts:cv:`proxy.config.http2.max_ping_frames_per_minute`.
+
+.. ts:stat:: global proxy.process.http2.max_priority_frames_per_minute_exceeded integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for exceeding the
+   maximum allowed number of priority frames per minute limit which is configured by
+   :ts:cv:`proxy.config.http2.max_priority_frames_per_minute`.
+
+.. ts:stat:: global proxy.process.http2.insufficient_avg_window_update integer
+   :type: counter
+
+   Represents the total number of closed HTTP/2 connections for not reaching the
+   minimum average window increment limit which is configured by
+   :ts:cv:`proxy.config.http2.min_avg_window_update`.

doc/admin-guide/monitoring/statistics/core/http-transaction.en.rst

@@ -150,3 +150,28 @@ HTTP Transaction
    :units: seconds
    :ungathered:
 
+
+HTTP/2
+------
+
+
+.. ts:stat:: global proxy.process.http2.total_client_streams integer
+   :type: counter
+
+   Represents the total number of HTTP/2 streams from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.current_client_streams integer
+   :type: gauge
+
+   Represents the current number of HTTP/2 streams from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.total_transactions_time integer
+   :type: counter
+   :units: seconds
+
+   Represents the total transaction time of HTTP/2 streams from client to the |TS|.
+
+.. ts:stat:: global proxy.process.http2.stream_errors integer
+   :type: counter
+
+   Represents the total number of HTTP/2 stream errors.

mgmt/RecordsConfig.cc

@@ -658,6 +658,10 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.http.slow.log.threshold", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
   ,
+  {RECT_CONFIG, "proxy.config.http2.connection.slow.log.threshold", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  ,
+  {RECT_CONFIG, "proxy.config.http2.stream.slow.log.threshold", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  ,
 
   //##############################################################################
   //#
@@ -1342,6 +1346,8 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.http2.min_avg_window_update", RECD_FLOAT, "2560.0", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
   ,
+  {RECT_CONFIG, "proxy.config.http2.header_table_size_limit", RECD_INT, "65536", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  ,
 
   //# Add LOCAL Records Here
   {RECT_LOCAL, "proxy.local.incoming_ip_to_bind", RECD_STRING, nullptr, RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}

proxy/Milestones.h

@@ -1,6 +1,6 @@
 /** @file
 
-  A brief file description
+  Milestones
 
   @section license License
 
@@ -23,35 +23,45 @@
 
 #pragma once
 
-#include "tscore/ink_platform.h"
-#include "tscore/ink_hrtime.h"
 #include "ts/apidefs.h"
+
+#include "tscore/ink_platform.h"
 #include "tscore/ink_hrtime.h"
 
-/////////////////////////////////////////////////////////////
-//
-// class TransactionMilestones
-//
-/////////////////////////////////////////////////////////////
-class TransactionMilestones
+#include "I_EventSystem.h"
+
+template <class T, size_t entries> class Milestones
 {
 public:
-  TransactionMilestones() { ink_zero(milestones); }
-  ink_hrtime &operator[](TSMilestonesType ms) { return milestones[ms]; }
-  ink_hrtime operator[](TSMilestonesType ms) const { return milestones[ms]; }
+  ink_hrtime &operator[](T ms) { return this->_milestones[static_cast<size_t>(ms)]; }
+  ink_hrtime operator[](T ms) const { return this->_milestones[static_cast<size_t>(ms)]; }
+
+  /**
+   * Mark given milestone with timestamp if it's not marked yet
+   * @param ms The milestone to mark
+   * @return N/A
+   */
+  void
+  mark(T ms)
+  {
+    if (this->_milestones[static_cast<size_t>(ms)] == 0) {
+      this->_milestones[static_cast<size_t>(ms)] = Thread::get_hrtime();
+    }
+  }
+
   /**
    * Takes two milestones and returns the difference.
    * @param start The start time
    * @param end The end time
    * @return The difference time in milliseconds
    */
   int64_t
-  difference_msec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
+  difference_msec(T ms_start, T ms_end) const
   {
-    if (milestones[ms_end] == 0) {
+    if (this->_milestones[static_cast<size_t>(ms_end)] == 0) {
       return -1;
     }
-    return ink_hrtime_to_msec(milestones[ms_end] - milestones[ms_start]);
+    return ink_hrtime_to_msec(this->_milestones[static_cast<size_t>(ms_end)] - this->_milestones[static_cast<size_t>(ms_start)]);
   }
 
   /**
@@ -61,17 +71,26 @@ class TransactionMilestones
    * @return A double that is the difference time in seconds
    */
   double
-  difference_sec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
+  difference_sec(T ms_start, T ms_end) const
   {
-    return (double)difference_msec(ms_start, ms_end) / 1000.0;
+    return static_cast<double>(difference_msec(ms_start, ms_end) / 1000.0);
   }
 
+  /**
+   * Takes two milestones and returns the difference.
+   * @param start The start time
+   * @param end The end time
+   * @return The difference time in high-resolution time
+   */
   ink_hrtime
-  elapsed(TSMilestonesType ms_start, TSMilestonesType ms_end) const
+  elapsed(T ms_start, T ms_end) const
   {
-    return milestones[ms_end] - milestones[ms_start];
+    return this->_milestones[static_cast<size_t>(ms_end)] - this->_milestones[static_cast<size_t>(ms_start)];
   }
 
 private:
-  ink_hrtime milestones[TS_MILESTONE_LAST_ENTRY];
+  std::array<ink_hrtime, entries> _milestones = {0};
 };
+
+// For compatibility with HttpSM.h and HttpTransact.h
+using TransactionMilestones = Milestones<TSMilestonesType, TS_MILESTONE_LAST_ENTRY>;

proxy/hdrs/Makefile.am

@@ -43,7 +43,11 @@ libhdrs_a_SOURCES = \
 	MIME.cc \
 	MIME.h \
 	URL.cc \
-	URL.h
+	URL.h \
+	HuffmanCodec.cc \
+	HuffmanCodec.h \
+	XPACK.cc \
+	XPACK.h
 
 if BUILD_TESTS
 libhdrs_a_SOURCES += \
@@ -62,9 +66,12 @@ load_http_hdr_LDADD = -L. -lhdrs \
 	$(top_builddir)/src/tscpp/util/libtscpputil.la \
 	@LIBTCL@
 
-check_PROGRAMS = test_mime
+check_PROGRAMS = \
+	test_mime \
+	test_Huffmancode \
+	test_XPACK
 
-TESTS = test_mime
+TESTS = $(check_PROGRAMS)
 
 test_mime_LDADD = -L. -lhdrs \
 	$(top_builddir)/src/tscore/libtscore.la \
@@ -78,6 +85,28 @@ test_mime_LDADD = -L. -lhdrs \
 
 test_mime_SOURCES = test_mime.cc
 
+test_Huffmancode_LDADD = \
+	$(top_builddir)/src/tscore/libtscore.la \
+	$(top_builddir)/src/tscpp/util/libtscpputil.la
+
+test_Huffmancode_SOURCES = \
+	test_Huffmancode.cc \
+	HuffmanCodec.cc \
+	HuffmanCodec.h
+
+test_XPACK_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(abs_top_srcdir)/tests/include
+
+test_XPACK_LDADD = \
+	$(top_builddir)/src/tscore/libtscore.la \
+	$(top_builddir)/src/tscpp/util/libtscpputil.la
+
+test_XPACK_SOURCES = \
+	unit_tests/test_XPACK.cc \
+	HuffmanCodec.cc \
+	XPACK.cc
+
 #test_UNUSED_SOURCES = \
 #  test_urlhash.cc