From 87bc8a9bc8b358de02d8078b6c2bb6d61dce1b80 Mon Sep 17 00:00:00 2001 From: alyssawilk Date: Tue, 18 Jun 2024 17:12:07 -0400 Subject: [PATCH] runtime: removing send_goaway_for_premature_rst_streams (#34735) Signed-off-by: Alyssa Wilk --- changelogs/current.yaml | 3 +++ source/common/http/conn_manager_impl.cc | 4 +--- source/common/runtime/runtime_features.cc | 1 - test/integration/multiplexed_integration_test.cc | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/changelogs/current.yaml b/changelogs/current.yaml index 5c6e1d1d040d..b9f054a2f128 100644 --- a/changelogs/current.yaml +++ b/changelogs/current.yaml @@ -200,6 +200,9 @@ removed_config_or_runtime: - area: http change: | Removed ``envoy.reloadable_features.use_cluster_cache_for_alt_protocols_filter`` runtime flag and lagacy code paths. +- area: http + change: | + Removed ``envoy.restart_features.send_goaway_for_premature_rst_streams`` runtime flag and legacy code paths. - area: load_balancing change: | Removed ``envoy.reloadable_features.enable_zone_routing_different_zone_counts`` runtime flag and legacy code paths. diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc index b217c1e2f7b2..d764ae1947d1 100644 --- a/source/common/http/conn_manager_impl.cc +++ b/source/common/http/conn_manager_impl.cc @@ -669,9 +669,7 @@ bool ConnectionManagerImpl::isPrematureRstStream(const ActiveStream& stream) con // Sends a GOAWAY if too many streams have been reset prematurely on this // connection. void ConnectionManagerImpl::maybeDrainDueToPrematureResets() { - if (!Runtime::runtimeFeatureEnabled( - "envoy.restart_features.send_goaway_for_premature_rst_streams") || - closed_non_internally_destroyed_requests_ == 0) { + if (closed_non_internally_destroyed_requests_ == 0) { return; } diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index c9496a9bfef5..4929db564ddb 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -101,7 +101,6 @@ RUNTIME_GUARD(envoy_reloadable_features_xdstp_path_avoid_colon_encoding); RUNTIME_GUARD(envoy_restart_features_allow_client_socket_creation_failure); RUNTIME_GUARD(envoy_restart_features_allow_slot_destroy_on_worker_threads); RUNTIME_GUARD(envoy_restart_features_quic_handle_certs_with_shared_tls_code); -RUNTIME_GUARD(envoy_restart_features_send_goaway_for_premature_rst_streams); RUNTIME_GUARD(envoy_restart_features_udp_read_normalize_addresses); RUNTIME_GUARD(envoy_restart_features_use_fast_protobuf_hash); diff --git a/test/integration/multiplexed_integration_test.cc b/test/integration/multiplexed_integration_test.cc index 4f534ecaf40d..a11beff41089 100644 --- a/test/integration/multiplexed_integration_test.cc +++ b/test/integration/multiplexed_integration_test.cc @@ -1118,8 +1118,6 @@ TEST_P(MultiplexedIntegrationTest, GoAway) { TEST_P(MultiplexedIntegrationTestWithSimulatedTime, GoAwayAfterTooManyResets) { EXCLUDE_DOWNSTREAM_HTTP3; // Need to wait for the server to reset the stream // before opening new one. - config_helper_.addRuntimeOverride("envoy.restart_features.send_goaway_for_premature_rst_streams", - "true"); const int total_streams = 100; config_helper_.addRuntimeOverride("overload.premature_reset_total_stream_count", absl::StrCat(total_streams)); @@ -1159,8 +1157,6 @@ TEST_P(MultiplexedIntegrationTestWithSimulatedTime, GoAwayAfterTooManyResets) { TEST_P(MultiplexedIntegrationTestWithSimulatedTime, GoAwayQuicklyAfterTooManyResets) { EXCLUDE_DOWNSTREAM_HTTP3; // Need to wait for the server to reset the stream // before opening new one. - config_helper_.addRuntimeOverride("envoy.restart_features.send_goaway_for_premature_rst_streams", - "true"); const int total_streams = 100; config_helper_.addRuntimeOverride("overload.premature_reset_total_stream_count", absl::StrCat(total_streams)); @@ -1187,8 +1183,6 @@ TEST_P(MultiplexedIntegrationTestWithSimulatedTime, GoAwayQuicklyAfterTooManyRes TEST_P(MultiplexedIntegrationTestWithSimulatedTime, DontGoAwayAfterTooManyResetsForLongStreams) { EXCLUDE_DOWNSTREAM_HTTP3; // Need to wait for the server to reset the stream // before opening new one. - config_helper_.addRuntimeOverride("envoy.restart_features.send_goaway_for_premature_rst_streams", - "true"); const int total_streams = 100; const int stream_lifetime_seconds = 2; config_helper_.addRuntimeOverride("overload.premature_reset_total_stream_count",