Skip to content

http2: moving functionality from http2 pool to client #13869

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 1 commit into from
Nov 3, 2020
Merged

http2: moving functionality from http2 pool to client #13869

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
49 changes: 26 additions & 23 deletions source/common/http/http2/conn_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ namespace Envoy {
namespace Http {
namespace Http2 {

// All streams are 2^31. Client streams are half that, minus stream 0. Just to be on the safe
// side we do 2^29.
static const uint64_t DEFAULT_MAX_STREAMS = (1 << 29);

ConnPoolImpl::ConnPoolImpl(Event::Dispatcher& dispatcher, Random::RandomGenerator& random_generator,
Upstream::HostConstSharedPtr host, Upstream::ResourcePriority priority,
const Network::ConnectionSocket::OptionsSharedPtr& options,
Expand All @@ -25,54 +29,53 @@ ConnPoolImpl::~ConnPoolImpl() { destructAllConnections(); }
Envoy::ConnectionPool::ActiveClientPtr ConnPoolImpl::instantiateActiveClient() {
return std::make_unique<ActiveClient>(*this);
}
void ConnPoolImpl::onGoAway(ActiveClient& client, Http::GoAwayErrorCode) {
ENVOY_CONN_LOG(debug, "remote goaway", *client.codec_client_);
host_->cluster().stats().upstream_cx_close_notify_.inc();
if (client.state_ != ActiveClient::State::DRAINING) {
if (client.codec_client_->numActiveRequests() == 0) {
client.codec_client_->close();

void ConnPoolImpl::ActiveClient::onGoAway(Http::GoAwayErrorCode) {
ENVOY_CONN_LOG(debug, "remote goaway", *codec_client_);
parent_.host()->cluster().stats().upstream_cx_close_notify_.inc();
if (state_ != ActiveClient::State::DRAINING) {
if (codec_client_->numActiveRequests() == 0) {
codec_client_->close();
} else {
transitionActiveClientState(client, ActiveClient::State::DRAINING);
parent_.transitionActiveClientState(*this, ActiveClient::State::DRAINING);
}
}
}

void ConnPoolImpl::onStreamDestroy(ActiveClient& client) {
onStreamClosed(client, false);
void ConnPoolImpl::ActiveClient::onStreamDestroy() {
parent().onStreamClosed(*this, false);

// If we are destroying this stream because of a disconnect, do not check for drain here. We will
// wait until the connection has been fully drained of streams and then check in the connection
// event callback.
if (!client.closed_with_active_rq_) {
checkForDrained();
if (!closed_with_active_rq_) {
parent().checkForDrained();
}
}

void ConnPoolImpl::onStreamReset(ActiveClient& client, Http::StreamResetReason reason) {
void ConnPoolImpl::ActiveClient::onStreamReset(Http::StreamResetReason reason) {
if (reason == StreamResetReason::ConnectionTermination ||
reason == StreamResetReason::ConnectionFailure) {
host_->cluster().stats().upstream_rq_pending_failure_eject_.inc();
client.closed_with_active_rq_ = true;
parent_.host()->cluster().stats().upstream_rq_pending_failure_eject_.inc();
closed_with_active_rq_ = true;
} else if (reason == StreamResetReason::LocalReset) {
host_->cluster().stats().upstream_rq_tx_reset_.inc();
parent_.host()->cluster().stats().upstream_rq_tx_reset_.inc();
} else if (reason == StreamResetReason::RemoteReset) {
host_->cluster().stats().upstream_rq_rx_reset_.inc();
parent_.host()->cluster().stats().upstream_rq_rx_reset_.inc();
}
}

uint64_t ConnPoolImpl::maxStreamsPerConnection() {
uint64_t max_streams_config = host_->cluster().maxRequestsPerConnection();
uint64_t maxStreamsPerConnection(uint64_t max_streams_config) {
return (max_streams_config != 0) ? max_streams_config : DEFAULT_MAX_STREAMS;
}

ConnPoolImpl::ActiveClient::ActiveClient(ConnPoolImpl& parent)
ConnPoolImpl::ActiveClient::ActiveClient(Envoy::Http::HttpConnPoolImplBase& parent)
: Envoy::Http::ActiveClient(
parent, parent.maxStreamsPerConnection(),
parent.host_->cluster().http2Options().max_concurrent_streams().value()) {
parent, maxStreamsPerConnection(parent.host()->cluster().maxRequestsPerConnection()),
parent.host()->cluster().http2Options().max_concurrent_streams().value()) {
codec_client_->setCodecClientCallbacks(*this);
codec_client_->setCodecConnectionCallbacks(*this);

parent.host_->cluster().stats().upstream_cx_http2_total_.inc();
parent.host()->cluster().stats().upstream_cx_http2_total_.inc();
}

bool ConnPoolImpl::ActiveClient::closingWithIncompleteStream() const {
Expand Down
25 changes: 6 additions & 19 deletions source/common/http/http2/conn_pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ class ConnPoolImpl : public Envoy::Http::HttpConnPoolImplBase {
// ConnPoolImplBase
Envoy::ConnectionPool::ActiveClientPtr instantiateActiveClient() override;

protected:
class ActiveClient : public CodecClientCallbacks,
public Http::ConnectionCallbacks,
public Envoy::Http::ActiveClient {
public:
ActiveClient(ConnPoolImpl& parent);
ActiveClient(Envoy::Http::HttpConnPoolImplBase& parent);
ActiveClient(Envoy::Http::HttpConnPoolImplBase& parent,
Upstream::Host::CreateConnectionData& data);
~ActiveClient() override = default;

ConnPoolImpl& parent() { return static_cast<ConnPoolImpl&>(parent_); }
Expand All @@ -46,29 +47,15 @@ class ConnPoolImpl : public Envoy::Http::HttpConnPoolImplBase {
RequestEncoder& newStreamEncoder(ResponseDecoder& response_decoder) override;

// CodecClientCallbacks
void onStreamDestroy() override { parent().onStreamDestroy(*this); }
void onStreamReset(Http::StreamResetReason reason) override {
parent().onStreamReset(*this, reason);
}
void onStreamDestroy() override;
void onStreamReset(Http::StreamResetReason reason) override;

// Http::ConnectionCallbacks
void onGoAway(Http::GoAwayErrorCode error_code) override {
parent().onGoAway(*this, error_code);
}
void onGoAway(Http::GoAwayErrorCode error_code) override;

bool closed_with_active_rq_{};
};

uint64_t maxStreamsPerConnection();
void movePrimaryClientToDraining();
void onGoAway(ActiveClient& client, Http::GoAwayErrorCode error_code);
void onStreamDestroy(ActiveClient& client);
void onStreamReset(ActiveClient& client, Http::StreamResetReason reason);

// All streams are 2^31. Client streams are half that, minus stream 0. Just to be on the safe
// side we do 2^29.
static const uint64_t DEFAULT_MAX_STREAMS = (1 << 29);

Random::RandomGenerator& random_generator_;
};

Expand Down