Skip to content

runtime: removing envoy.reloadable_features.improved_stream_limit_handling #18549

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
alyssawilk merged 2 commits into from
Oct 12, 2021
Merged

runtime: removing envoy.reloadable_features.improved_stream_limit_handling #18549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e43c5
runtime updates
alyssawilk Oct 6, 2021
9d06254
Merge branch 'main' into improved_stream_limit_handling
alyssawilk Oct 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
1 change: 1 addition & 0 deletions docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Removed Config or Runtime

* compression: removed ``envoy.reloadable_features.enable_compression_without_content_length_header`` runtime guard and legacy code paths.
* http: removed ``envoy.reloadable_features.dont_add_content_length_for_bodiless_requests deprecation`` and legacy code paths.
* http: removed ``envoy.reloadable_features.improved_stream_limit_handling`` and legacy code paths.
* http: removed ``envoy.reloadable_features.return_502_for_upstream_protocol_errors``. Envoy will always return 502 code upon encountering upstream protocol error.
* http: removed ``envoy.reloadable_features.treat_upstream_connect_timeout_as_connect_failure`` and legacy code paths.

Expand Down
3 changes: 1 addition & 2 deletions source/common/http/conn_pool_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ void MultiplexedActiveClientBase::onGoAway(Http::GoAwayErrorCode) {
// not considering http/2 connections connected until the SETTINGS frame is
// received, but that would result in a latency penalty instead.
void MultiplexedActiveClientBase::onSettings(ReceivedSettings& settings) {
if (Runtime::runtimeFeatureEnabled("envoy.reloadable_features.improved_stream_limit_handling") &&
settings.maxConcurrentStreams().has_value() &&
if (settings.maxConcurrentStreams().has_value() &&
settings.maxConcurrentStreams().value() < concurrent_stream_limit_) {
int64_t old_unused_capacity = currentUnusedCapacity();
// Given config limits old_unused_capacity should never exceed int32_t.
Expand Down
1 change: 0 additions & 1 deletion source/common/runtime/runtime_features.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ constexpr const char* runtime_features[] = {
"envoy.reloadable_features.http_reject_path_with_fragment",
"envoy.reloadable_features.http_strip_fragment_from_path_unsafe_if_disabled",
"envoy.reloadable_features.http_transport_failure_reason_in_body",
"envoy.reloadable_features.improved_stream_limit_handling",
"envoy.reloadable_features.internal_redirects_with_body",
"envoy.reloadable_features.listener_reuse_port_default_enabled",
"envoy.reloadable_features.listener_wildcard_match_ip_family",
Expand Down
4 changes: 0 additions & 4 deletions test/common/http/http2/conn_pool_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,10 +1488,6 @@ TEST_F(Http2ConnPoolImplTest, PreconnectWithMultiplexing) {
}

TEST_F(Http2ConnPoolImplTest, PreconnectWithSettings) {
TestScopedRuntime scoped_runtime;
Runtime::LoaderSingleton::getExisting()->mergeValues(
{{"envoy.reloadable_features.improved_stream_limit_handling", "true"}});

cluster_->http2_options_.mutable_max_concurrent_streams()->set_value(2);
ON_CALL(*cluster_, perUpstreamPreconnectRatio).WillByDefault(Return(1.5));

Expand Down
21 changes: 2 additions & 19 deletions test/integration/http2_flood_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,23 +1499,7 @@ TEST_P(Http2FloodMitigationTest, UpstreamFloodDetectionIsOnByDefault) {
"cluster.cluster_0.http2.outbound_control_flood");
}

class Http2ManyStreamsTest
: public testing::TestWithParam<std::tuple<Network::Address::IpVersion, bool>>,
public Http2RawFrameIntegrationTest {
protected:
Http2ManyStreamsTest() : Http2RawFrameIntegrationTest(std::get<0>(GetParam())) {
config_helper_.addRuntimeOverride("envoy.reloadable_features.improved_stream_limit_handling",
useImprovedStreamLimitHandling() ? "true" : "false");
}

bool useImprovedStreamLimitHandling() const { return std::get<1>(GetParam()); }
};

INSTANTIATE_TEST_SUITE_P(
IpVersionsAndRuntimeFeature, Http2ManyStreamsTest,
testing::Combine(testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), testing::Bool()));

TEST_P(Http2ManyStreamsTest, UpstreamRstStreamStormOnDownstreamCloseRegressionTest) {
TEST_P(Http2FloodMitigationTest, UpstreamRstStreamStormOnDownstreamCloseRegressionTest) {
const uint32_t num_requests = 80;

envoy::config::core::v3::Http2ProtocolOptions config;
Expand Down Expand Up @@ -1555,8 +1539,7 @@ TEST_P(Http2ManyStreamsTest, UpstreamRstStreamStormOnDownstreamCloseRegressionTe
// The disconnect shouldn't trigger an outbound control frame flood.
EXPECT_EQ(0, test_server_->counter("cluster.cluster_0.http2.outbound_control_flood")->value());
// Verify that the upstream connections are still active.
EXPECT_EQ(useImprovedStreamLimitHandling() ? 2 : 1,
test_server_->gauge("cluster.cluster_0.upstream_cx_active")->value());
EXPECT_EQ(2, test_server_->gauge("cluster.cluster_0.upstream_cx_active")->value());
}

} // namespace Envoy