Skip to content

Delete legacy connection pool code. #10881

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 2 commits into from
Apr 22, 2020
Merged

Delete legacy connection pool code. #10881

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
7e8b7e2
Delete legacy connection pool code.
ggreenway Apr 21, 2020
d60e6aa
Merge remote-tracking branch 'upstream/master' into delete-legacy-con…
ggreenway Apr 21, 2020
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: 2 additions & 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 @@ -15,6 +15,8 @@ Changes
`google.api.HttpBody <https://github.com/googleapis/googleapis/blob/master/google/api/httpbody.proto>`_.
* http: fixed a bug where the upgrade header was not cleared on responses to non-upgrade requests.
Can be reverted temporarily by setting runtime feature `envoy.reloadable_features.fix_upgrade_response` to false.
* http: remove legacy connection pool code and their runtime features: `envoy.reloadable_features.new_http1_connection_pool_behavior` and
`envoy.reloadable_features.new_http2_connection_pool_behavior`.
* logger: added :ref:`--log-format-prefix-with-location <operations_cli>` command line option to prefix '%v' with file path and line number.
* network filters: added a :ref:`postgres proxy filter <config_network_filters_postgres_proxy>`.
* router: allow retries of streaming or incomplete requests. This removes stat `rq_retry_skipped_request_not_complete`.
Expand Down
12 changes: 0 additions & 12 deletions source/common/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,6 @@ envoy_cc_library(
],
)

envoy_cc_library(
name = "conn_pool_base_legacy_lib",
srcs = ["conn_pool_base_legacy.cc"],
hdrs = ["conn_pool_base_legacy.h"],
deps = [
"//include/envoy/http:conn_pool_interface",
"//include/envoy/stats:timespan_interface",
"//source/common/common:linked_object",
"//source/common/stats:timespan_lib",
],
)

envoy_cc_library(
name = "conn_manager_config_interface",
hdrs = ["conn_manager_config.h"],
Expand Down
98 changes: 0 additions & 98 deletions source/common/http/conn_pool_base_legacy.cc
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions source/common/http/conn_pool_base_legacy.h
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions source/common/http/http1/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,42 +43,12 @@ envoy_cc_library(
],
)

envoy_cc_library(
name = "conn_pool_legacy_lib",
srcs = ["conn_pool_legacy.cc"],
hdrs = ["conn_pool_legacy.h"],
external_deps = ["abseil_optional"],
deps = [
"//include/envoy/event:deferred_deletable",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/event:timer_interface",
"//include/envoy/http:conn_pool_interface",
"//include/envoy/http:header_map_interface",
"//include/envoy/network:connection_interface",
"//include/envoy/stats:stats_interface",
"//include/envoy/stats:timespan_interface",
"//include/envoy/upstream:upstream_interface",
"//source/common/common:linked_object",
"//source/common/common:utility_lib",
"//source/common/http:codec_client_lib",
"//source/common/http:codec_wrappers_lib",
"//source/common/http:codes_lib",
"//source/common/http:conn_pool_base_legacy_lib",
"//source/common/http:headers_lib",
"//source/common/network:utility_lib",
"//source/common/runtime:runtime_features_lib",
"//source/common/stats:timespan_lib",
"//source/common/upstream:upstream_lib",
],
)

envoy_cc_library(
name = "conn_pool_lib",
srcs = ["conn_pool.cc"],
hdrs = ["conn_pool.h"],
external_deps = ["abseil_optional"],
deps = [
":conn_pool_legacy_lib",
"//include/envoy/event:deferred_deletable",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/event:timer_interface",
Expand Down
11 changes: 2 additions & 9 deletions source/common/http/http1/conn_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "common/http/codec_client.h"
#include "common/http/codes.h"
#include "common/http/headers.h"
#include "common/http/http1/conn_pool_legacy.h"
#include "common/runtime/runtime_features.h"

#include "absl/strings/match.h"
Expand Down Expand Up @@ -138,14 +137,8 @@ allocateConnPool(Event::Dispatcher& dispatcher, Upstream::HostConstSharedPtr hos
Upstream::ResourcePriority priority,
const Network::ConnectionSocket::OptionsSharedPtr& options,
const Network::TransportSocketOptionsSharedPtr& transport_socket_options) {
if (Runtime::runtimeFeatureEnabled(
"envoy.reloadable_features.new_http1_connection_pool_behavior")) {
return std::make_unique<Http::Http1::ProdConnPoolImpl>(dispatcher, host, priority, options,
transport_socket_options);
} else {
return std::make_unique<Http::Legacy::Http1::ProdConnPoolImpl>(
dispatcher, host, priority, options, transport_socket_options);
}
return std::make_unique<Http::Http1::ProdConnPoolImpl>(dispatcher, host, priority, options,
transport_socket_options);
}

} // namespace Http1
Expand Down
Loading