Skip to content
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.

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

envoy: http connection pool for metadata upstream extension #3314

Merged
merged 3 commits into from May 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/envoy/upstreams/http/metadata/BUILD
Expand Up @@ -30,8 +30,13 @@ envoy_cc_library(
hdrs = ["upstream_request.h"],
repository = "@envoy",
deps = [
"@com_google_absl//absl/types:optional",
"@envoy//include/envoy/http:codec_interface",
"@envoy//include/envoy/router:router_interface",
"@envoy//include/envoy/stream_info:stream_info_interface",
"@envoy//include/envoy/upstream:host_description_interface",
"@envoy//include/envoy/upstream:load_balancer_interface",
"@envoy//include/envoy/upstream:thread_local_cluster_interface",
"@envoy//source/extensions/upstreams/http/http:upstream_request_lib",
],
)
Expand Down
32 changes: 32 additions & 0 deletions src/envoy/upstreams/http/metadata/upstream_request.cc
Expand Up @@ -14,3 +14,35 @@
*/

#include "src/envoy/upstreams/http/metadata/upstream_request.h"

#include <memory>
#include <utility>

#include "absl/types/optional.h"
#include "envoy/http/codec.h"
#include "envoy/http/protocol.h"
#include "envoy/stream_info/stream_info.h"
#include "envoy/upstream/host_description.h"

namespace Envoy {
namespace Upstreams {
namespace Http {
namespace Metadata {

void MetadataConnPool::onPoolReady(
Envoy::Http::RequestEncoder& request_encoder,
Upstream::HostDescriptionConstSharedPtr host,
const StreamInfo::StreamInfo& info,
absl::optional<Envoy::Http::Protocol> protocol) {
conn_pool_stream_handle_ = nullptr;
auto upstream = std::make_unique<MetadataUpstream>(
callbacks_->upstreamToDownstream(), &request_encoder);
callbacks_->onPoolReady(std::move(upstream), host,
request_encoder.getStream().connectionLocalAddress(),
info, protocol);
}

} // namespace Metadata
} // namespace Http
} // namespace Upstreams
} // namespace Envoy
22 changes: 22 additions & 0 deletions src/envoy/upstreams/http/metadata/upstream_request.h
Expand Up @@ -15,15 +15,37 @@

#pragma once

#include "absl/types/optional.h"
#include "envoy/http/codec.h"
#include "envoy/http/protocol.h"
#include "envoy/router/router.h"
#include "envoy/stream_info/stream_info.h"
#include "envoy/upstream/host_description.h"
#include "envoy/upstream/load_balancer.h"
#include "envoy/upstream/thread_local_cluster.h"
#include "extensions/upstreams/http/http/upstream_request.h"

namespace Envoy {
namespace Upstreams {
namespace Http {
namespace Metadata {

class MetadataConnPool
: public Extensions::Upstreams::Http::Http::HttpConnPool {
public:
MetadataConnPool(Upstream::ThreadLocalCluster& thread_local_cluster,
bool is_connect, const Router::RouteEntry& route_entry,
absl::optional<Envoy::Http::Protocol> downstream_protocol,
Upstream::LoadBalancerContext* ctx)
: HttpConnPool(thread_local_cluster, is_connect, route_entry,
downstream_protocol, ctx) {}

void onPoolReady(Envoy::Http::RequestEncoder& callbacks_encoder,
Upstream::HostDescriptionConstSharedPtr host,
const StreamInfo::StreamInfo& info,
absl::optional<Envoy::Http::Protocol> protocol) override;
};

class MetadataUpstream
: public Extensions::Upstreams::Http::Http::HttpUpstream {
public:
Expand Down