http: forwarding transport failure details for CONNECT and ALPN connections (#16975)

Previously, L7 connections forwarded over TCP didn't get connection failure details (auto_http before codec assignment, CONNECT requests during the entire lifetime) but now they should. Risk Level: low Testing: unit test. Docs Changes: n/a Release Notes: n/a Fixes #/16881 Signed-off-by: Alyssa Wilk <alyssar@chromium.org>

Author: alyssawilk

envoy/tcp/conn_pool.h

@@ -103,10 +103,11 @@ class Callbacks {
  /**
  * Called when a pool error occurred and no connection could be acquired for making the request.
  * @param reason supplies the failure reason.
+ * @param transport_failure_reason supplies the details of the transport failure reason.
  * @param host supplies the description of the host that caused the failure. This may be nullptr
  * if no host was involved in the failure (for example overflow).
  */
- virtual void onPoolFailure(PoolFailureReason reason,
+ virtual void onPoolFailure(PoolFailureReason reason, absl::string_view transport_failure_reason,
  Upstream::HostDescriptionConstSharedPtr host) PURE;
 
  /**

source/common/tcp/conn_pool.h

@@ -204,10 +204,10 @@ class ConnPoolImpl : public Envoy::ConnectionPool::ConnPoolImplBase,
  }
 
  void onPoolFailure(const Upstream::HostDescriptionConstSharedPtr& host_description,
- absl::string_view, ConnectionPool::PoolFailureReason reason,
+ absl::string_view failure_reason, ConnectionPool::PoolFailureReason reason,
  Envoy::ConnectionPool::AttachContext& context) override {
  auto* callbacks = typedContext<TcpAttachContext>(context).callbacks_;
- callbacks->onPoolFailure(reason, host_description);
+ callbacks->onPoolFailure(reason, failure_reason, host_description);
  }
 
  // These two functions exist for testing parity between old and new Tcp Connection Pools.

source/common/tcp/original_conn_pool.cc

@@ -128,7 +128,7 @@ OriginalConnPoolImpl::newConnection(ConnectionPool::Callbacks& callbacks) {
  return pending_requests_.front().get();
  } else {
  ENVOY_LOG(debug, "max pending requests overflow");
- callbacks.onPoolFailure(ConnectionPool::PoolFailureReason::Overflow, nullptr);
+ callbacks.onPoolFailure(ConnectionPool::PoolFailureReason::Overflow, "", nullptr);
  host_->cluster().stats().upstream_rq_pending_overflow_.inc();
  return nullptr;
  }
@@ -184,7 +184,7 @@ void OriginalConnPoolImpl::onConnectionEvent(ActiveConn& conn, Network::Connecti
  PendingRequestPtr request =
  pending_requests_to_purge.front()->removeFromList(pending_requests_to_purge);
  host_->cluster().stats().upstream_rq_pending_failure_eject_.inc();
- request->callbacks_.onPoolFailure(reason, conn.real_host_description_);
+ request->callbacks_.onPoolFailure(reason, "", conn.real_host_description_);
  }
  }
 

source/common/tcp_proxy/upstream.cc

@@ -172,7 +172,7 @@ void TcpConnPool::newStream(GenericConnectionPoolCallbacks& callbacks) {
  }
 }
 
-void TcpConnPool::onPoolFailure(ConnectionPool::PoolFailureReason reason,
+void TcpConnPool::onPoolFailure(ConnectionPool::PoolFailureReason reason, absl::string_view,
  Upstream::HostDescriptionConstSharedPtr host) {
  upstream_handle_ = nullptr;
  callbacks_->onGenericPoolFailure(reason, host);

source/common/tcp_proxy/upstream.h

@@ -29,6 +29,7 @@ class TcpConnPool : public GenericConnPool, public Tcp::ConnectionPool::Callback
 
  // Tcp::ConnectionPool::Callbacks
  void onPoolFailure(ConnectionPool::PoolFailureReason reason,
+ absl::string_view transport_failure_reason,
  Upstream::HostDescriptionConstSharedPtr host) override;
  void onPoolReady(Tcp::ConnectionPool::ConnectionDataPtr&& conn_data,
  Upstream::HostDescriptionConstSharedPtr host) override;

source/extensions/filters/network/dubbo_proxy/router/router_impl.cc

@@ -281,6 +281,7 @@ void Router::UpstreamRequest::encodeData(Buffer::Instance& data) {
 }
 
 void Router::UpstreamRequest::onPoolFailure(ConnectionPool::PoolFailureReason reason,
+ absl::string_view,
  Upstream::HostDescriptionConstSharedPtr host) {
  conn_pool_handle_ = nullptr;
 

source/extensions/filters/network/dubbo_proxy/router/router_impl.h

@@ -61,6 +61,7 @@ class Router : public Tcp::ConnectionPool::UpstreamCallbacks,
 
  // Tcp::ConnectionPool::Callbacks
  void onPoolFailure(ConnectionPool::PoolFailureReason reason,
+ absl::string_view transport_failure_reason,
  Upstream::HostDescriptionConstSharedPtr host) override;
  void onPoolReady(Tcp::ConnectionPool::ConnectionDataPtr&& conn,
  Upstream::HostDescriptionConstSharedPtr host) override;

source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc

@@ -166,6 +166,7 @@ void RouterImpl::UpstreamRequest::onPoolReady(Tcp::ConnectionPool::ConnectionDat
 }
 
 void RouterImpl::UpstreamRequest::onPoolFailure(Tcp::ConnectionPool::PoolFailureReason reason,
+ absl::string_view,
  Upstream::HostDescriptionConstSharedPtr host) {
  if (router_.handle_) {
  ENVOY_LOG(trace, "#onPoolFailure, reset cancellable handle to nullptr");

source/extensions/filters/network/rocketmq_proxy/router/router_impl.h

@@ -41,6 +41,7 @@ class RouterImpl : public Router, public Logger::Loggable<Logger::Id::rocketmq>
  UpstreamRequest(RouterImpl& router);
 
  void onPoolFailure(Tcp::ConnectionPool::PoolFailureReason reason,
+ absl::string_view transport_failure_reason,
  Upstream::HostDescriptionConstSharedPtr host) override;
 
  void onPoolReady(Tcp::ConnectionPool::ConnectionDataPtr&& conn,

source/extensions/filters/network/thrift_proxy/router/router_impl.cc

@@ -483,6 +483,7 @@ void Router::UpstreamRequest::releaseConnection(const bool close) {
 void Router::UpstreamRequest::resetStream() { releaseConnection(true); }
 
 void Router::UpstreamRequest::onPoolFailure(ConnectionPool::PoolFailureReason reason,
+ absl::string_view,
  Upstream::HostDescriptionConstSharedPtr host) {
  conn_pool_handle_ = nullptr;