Skip to content

upstream: clean up feature parsing code #14629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lizan merged 3 commits into from
Jan 12, 2021
Merged

upstream: clean up feature parsing code #14629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4aca6a
upstream: clean up feature parsing
alyssawilk Jan 11, 2021
f1789ab
less oventhusiastic
alyssawilk Jan 11, 2021
1baa373
format
alyssawilk Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/common/upstream/upstream_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ ClusterInfoImpl::ClusterInfoImpl(
config, *stats_scope_, factory_context.clusterManager())
: nullptr),
features_(ClusterInfoImpl::HttpProtocolOptionsConfigImpl::parseFeatures(
config, http_protocol_options_)),
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_)),
Expand Down
32 changes: 11 additions & 21 deletions source/extensions/upstreams/http/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,33 +43,23 @@ getHttp2Options(const envoy::extensions::upstreams::http::v3::HttpProtocolOption

} // namespace

uint64_t
ProtocolOptionsConfigImpl::parseFeatures(const envoy::config::cluster::v3::Cluster& config,
std::shared_ptr<const ProtocolOptionsConfigImpl> options) {
uint64_t ProtocolOptionsConfigImpl::parseFeatures(const envoy::config::cluster::v3::Cluster& config,
const ProtocolOptionsConfigImpl& options) {
uint64_t features = 0;

if (options) {
if (options->use_http2_) {
features |= Upstream::ClusterInfo::Features::HTTP2;
}
if (options->use_downstream_protocol_) {
features |= Upstream::ClusterInfo::Features::USE_DOWNSTREAM_PROTOCOL;
}
} else {
if (config.has_http2_protocol_options()) {
features |= Upstream::ClusterInfo::Features::HTTP2;
}
if (config.protocol_selection() ==
envoy::config::cluster::v3::Cluster::USE_DOWNSTREAM_PROTOCOL) {
features |= Upstream::ClusterInfo::Features::USE_DOWNSTREAM_PROTOCOL;
}
if (options.use_http2_) {
features |= Upstream::ClusterInfo::Features::HTTP2;
}
if (config.close_connections_on_host_health_failure()) {
features |= Upstream::ClusterInfo::Features::CLOSE_CONNECTIONS_ON_HOST_HEALTH_FAILURE;
if (options.use_downstream_protocol_) {
features |= Upstream::ClusterInfo::Features::USE_DOWNSTREAM_PROTOCOL;
}
if (options->use_alpn_) {
if (options.use_alpn_) {
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;
}

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/upstreams/http/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ProtocolOptionsConfigImpl : public Upstream::ProtocolOptionsConfig {
// 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,
std::shared_ptr<const ProtocolOptionsConfigImpl> options);
const ProtocolOptionsConfigImpl& options);

const Envoy::Http::Http1Settings http1_settings_;
const envoy::config::core::v3::Http2ProtocolOptions http2_options_;
Expand Down
4 changes: 4 additions & 0 deletions test/common/upstream/cluster_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ TEST_F(ClusterManagerImplTest, MultipleProtocolCluster) {
protocol_selection: USE_DOWNSTREAM_PROTOCOL
)EOF";
create(parseBootstrapFromV3Yaml(yaml));
auto info =
cluster_manager_->clusters().active_clusters_.find("http12_cluster")->second.get().info();
EXPECT_NE(0, info->features() & Upstream::ClusterInfo::Features::USE_DOWNSTREAM_PROTOCOL);

checkConfigDump(R"EOF(
static_clusters:
- cluster:
Expand Down