Skip to content

runtime: removed envoy.reloadable_features.return_502_for_upstream_protocol_errors #18509

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
mattklein123 merged 1 commit into from
Oct 8, 2021
Merged

runtime: removed envoy.reloadable_features.return_502_for_upstream_protocol_errors #18509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -20,6 +20,7 @@ Removed Config or Runtime
-------------------------
*Normally occurs at the end of the* :ref:`deprecation period <deprecated>`

* 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.

New Features
Expand Down
8 changes: 2 additions & 6 deletions source/common/http/codec_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,8 @@ void CodecClient::onEvent(Network::ConnectionEvent event) {
if (connected_) {
reason = StreamResetReason::ConnectionTermination;
if (protocol_error_) {
if (Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.return_502_for_upstream_protocol_errors")) {
reason = StreamResetReason::ProtocolError;
connection_->streamInfo().setResponseFlag(
StreamInfo::ResponseFlag::UpstreamProtocolError);
}
reason = StreamResetReason::ProtocolError;
connection_->streamInfo().setResponseFlag(StreamInfo::ResponseFlag::UpstreamProtocolError);
}
} else {
ENVOY_CONN_LOG(warn, "Connection is closed by {} during connecting.", *connection_,
Expand Down
9 changes: 2 additions & 7 deletions source/common/http/http2/codec_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1728,14 +1728,9 @@ ClientConnectionImpl::trackOutboundFrames(bool is_outbound_flood_monitored_contr
}

StreamResetReason ClientConnectionImpl::getMessagingErrorResetReason() const {
StreamResetReason reason = StreamResetReason::LocalReset;
if (Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.return_502_for_upstream_protocol_errors")) {
reason = StreamResetReason::ProtocolError;
connection_.streamInfo().setResponseFlag(StreamInfo::ResponseFlag::UpstreamProtocolError);
}
connection_.streamInfo().setResponseFlag(StreamInfo::ResponseFlag::UpstreamProtocolError);

return reason;
return StreamResetReason::ProtocolError;
}

ServerConnectionImpl::ServerConnectionImpl(
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 @@ -85,7 +85,6 @@ constexpr const char* runtime_features[] = {
"envoy.reloadable_features.preserve_downstream_scheme",
"envoy.reloadable_features.remove_forked_chromium_url",
"envoy.reloadable_features.require_strict_1xx_and_204_response_headers",
"envoy.reloadable_features.return_502_for_upstream_protocol_errors",
"envoy.reloadable_features.send_strict_1xx_and_204_response_headers",
"envoy.reloadable_features.strip_port_from_connect",
"envoy.reloadable_features.treat_host_like_authority",
Expand Down
13 changes: 2 additions & 11 deletions test/integration/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,17 +1275,8 @@ TEST_P(IntegrationTest, Connect) {
EXPECT_EQ(normalizeDate(response1), normalizeDate(response2));
}

// Test that Envoy by default returns HTTP code 502 on upstream protocol error.
TEST_P(IntegrationTest, UpstreamProtocolErrorDefault) {
testRouterUpstreamProtocolError("502", "UPE");
}

// Test runtime overwrite to return 503 on upstream protocol error.
TEST_P(IntegrationTest, UpstreamProtocolErrorRuntimeOverwrite) {
config_helper_.addRuntimeOverride(
"envoy.reloadable_features.return_502_for_upstream_protocol_errors", "false");
testRouterUpstreamProtocolError("503", "UC");
}
// Test that Envoy returns HTTP code 502 on upstream protocol error.
TEST_P(IntegrationTest, UpstreamProtocolError) { testRouterUpstreamProtocolError("502", "UPE"); }

TEST_P(IntegrationTest, TestHead) {
initialize();
Expand Down