Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelogs/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ bug_fixes:

removed_config_or_runtime:
# *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`
- area: router
change: |
Removed runtime guard ``envoy.reloadable_features.async_host_selection`` and legacy code paths.
- area: http
change: |
Removed runtime guard ``envoy.reloadable_features.http1_balsa_allow_cr_or_lf_at_request_start`` and legacy code paths.
Expand Down
6 changes: 2 additions & 4 deletions source/common/router/router.cc
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,7 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers,
callbacks_->dispatcher().timeSource().monotonicTime());

auto host_selection_response = cluster->chooseHost(this);
if (!host_selection_response.cancelable ||
!Runtime::runtimeFeatureEnabled("envoy.reloadable_features.async_host_selection")) {
if (!host_selection_response.cancelable) {
if (host_selection_response.cancelable) {
host_selection_response.cancelable->cancel();
}
Expand Down Expand Up @@ -2191,8 +2190,7 @@ void Filter::doRetry(bool can_send_early_data, bool can_use_http3, TimeoutRetry
"envoy.router.host_selection_start_ms",
callbacks_->dispatcher().timeSource().monotonicTime());
auto host_selection_response = cluster->chooseHost(this);
if (!host_selection_response.cancelable ||
!Runtime::runtimeFeatureEnabled("envoy.reloadable_features.async_host_selection")) {
if (!host_selection_response.cancelable) {
if (host_selection_response.cancelable) {
host_selection_response.cancelable->cancel();
}
Expand Down
1 change: 0 additions & 1 deletion source/common/runtime/runtime_features.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
// If issues are found that require a runtime feature to be disabled, it should be reported
// ASAP by filing a bug on github. Overriding non-buggy code is strongly discouraged to avoid the
// problem of the bugs being found after the old code path has been removed.
RUNTIME_GUARD(envoy_reloadable_features_async_host_selection);
RUNTIME_GUARD(envoy_reloadable_features_decouple_explicit_drain_pools_and_dns_refresh);
RUNTIME_GUARD(envoy_reloadable_features_dfp_cluster_resolves_hosts);
RUNTIME_GUARD(envoy_reloadable_features_disallow_quic_client_udp_mmsg);
Expand Down
12 changes: 0 additions & 12 deletions test/integration/protocol_integration_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5834,18 +5834,6 @@ TEST_P(DownstreamProtocolIntegrationTest, UnknownPseudoHeader) {
}
}

TEST_P(DownstreamProtocolIntegrationTest, ConfigureAsyncLbWhenUnsupported) {
// Configure the async round robin load balancer but disable async host
// selection. This should result in host selection failing.
config_helper_.addRuntimeOverride("envoy.reloadable_features.async_host_selection", "false");
config_helper_.setAsyncLb();
initialize();
codec_client_ = makeHttpConnection(lookupPort("http"));
auto response = codec_client_->makeHeaderOnlyRequest(default_request_headers_);
ASSERT_TRUE(response->waitForEndStream());
EXPECT_EQ("503", response->headers().getStatusValue());
}

TEST_P(DownstreamProtocolIntegrationTest, EmptyCookieHeader) {
initialize();
codec_client_ = makeHttpConnection(lookupPort("http"));
Expand Down
Loading