less oventhusiastic

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
envoyproxy · Jan 11, 2021 · f1789ab · f1789ab
1 parent f4aca6a
commit f1789ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc
@@ -727,8 +727,8 @@ ClusterInfoImpl::ClusterInfoImpl(
  ? std::make_unique<OptionalClusterStats>(
  config, *stats_scope_, factory_context.clusterManager())
  : nullptr),
- features_(
- ClusterInfoImpl::HttpProtocolOptionsConfigImpl::parseFeatures(*http_protocol_options_)),
+ features_(ClusterInfoImpl::HttpProtocolOptionsConfigImpl::parseFeatures(
+ config, *http_protocol_options_)),
  resource_managers_(config, runtime, name_, *stats_scope_,
  factory_context.clusterManager().clusterCircuitBreakersStatNames()),
  maintenance_mode_runtime_key_(absl::StrCat("upstream.maintenance_mode.", name_)),

diff --git a/source/extensions/upstreams/http/config.cc b/source/extensions/upstreams/http/config.cc
@@ -43,7 +43,9 @@ getHttp2Options(const envoy::extensions::upstreams::http::v3::HttpProtocolOption
 
 } // namespace
 
-uint64_t ProtocolOptionsConfigImpl::parseFeatures(const ProtocolOptionsConfigImpl& options) {
+uint64_t
+ProtocolOptionsConfigImpl::parseFeatures(const envoy::config::cluster::v3::Cluster& config,
+ const ProtocolOptionsConfigImpl& options) {
  uint64_t features = 0;
 
  if (options.use_http2_) {
@@ -56,6 +58,9 @@ uint64_t ProtocolOptionsConfigImpl::parseFeatures(const ProtocolOptionsConfigImp
  features |= Upstream::ClusterInfo::Features::USE_ALPN;
  }
 
+ if (config.close_connections_on_host_health_failure()) {
+ features |= Upstream::ClusterInfo::Features::CLOSE_CONNECTIONS_ON_HOST_HEALTH_FAILURE;
+ }
  return features;
 }
 

diff --git a/source/extensions/upstreams/http/config.h b/source/extensions/upstreams/http/config.h
@@ -34,9 +34,10 @@ class ProtocolOptionsConfigImpl : public Upstream::ProtocolOptionsConfig {
  const absl::optional<envoy::config::core::v3::UpstreamHttpProtocolOptions> upstream_options,
  bool use_downstream_protocol, bool use_http2);
 
- // Given the supplied protocol options configuration, returns a unit64_t representing the enabled
- // Upstream::ClusterInfo::Features.
- static uint64_t parseFeatures(const ProtocolOptionsConfigImpl& options);
+ // Given the supplied cluster config, and protocol options configuration,
+ // returns a unit64_t representing the enabled Upstream::ClusterInfo::Features.
+ static uint64_t parseFeatures(const envoy::config::cluster::v3::Cluster& config,
+ const ProtocolOptionsConfigImpl& options);
 
  const Envoy::Http::Http1Settings http1_settings_;
  const envoy::config::core::v3::Http2ProtocolOptions http2_options_;