Skip to content

http/2: remove upstream max concurrent streams check #981

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 9 commits into from
May 19, 2017
Merged

http/2: remove upstream max concurrent streams check #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9070524
cluster max_concurrent_streams config
May 17, 2017
16ce602
Revert "cluster max_concurrent_streams config"
May 18, 2017
3c58b91
Remove MAX_STREAMS check on client side connection pool. (#963)
May 18, 2017
6aeda69
Remove MAX_STREAMS check on client side connection pool. (#963)
May 18, 2017
0748a6d
Merge branch 'issue963' of https://github.com/jwfang/envoy into issue963
May 18, 2017
1f7fe82
Merge branch 'issue963' of https://github.com/jwfang/envoy into issue963
May 18, 2017
8c13946
Merge branch 'issue963' of https://github.com/jwfang/envoy into issue963
May 18, 2017
9e6cad8
Fix test.
May 18, 2017
6b0d74f
add back resource manager check
May 18, 2017
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
5 changes: 1 addition & 4 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 @@ -82,8 +82,7 @@ ConnectionPool::Cancellable* ConnPoolImpl::newStream(Http::StreamDecoder& respon
primary_client_.reset(new ActiveClient(*this));
}

if (primary_client_->client_->numActiveRequests() >= maxConcurrentStreams() ||
!host_->cluster().resourceManager(priority_).requests().canCreate()) {
if (!host_->cluster().resourceManager(priority_).requests().canCreate()) {
log_debug("max requests overflow");
callbacks.onPoolFailure(ConnectionPool::PoolFailureReason::Overflow, nullptr);
host_->cluster().stats().upstream_rq_pending_overflow_.inc();
Expand Down Expand Up @@ -247,8 +246,6 @@ CodecClientPtr ProdConnPoolImpl::createCodecClient(Upstream::Host::CreateConnect
return codec;
}

uint64_t ProdConnPoolImpl::maxConcurrentStreams() { return ConnectionImpl::MAX_CONCURRENT_STREAMS; }

uint32_t ProdConnPoolImpl::maxTotalStreams() { return MAX_STREAMS; }

} // Http2
Expand Down
2 changes: 0 additions & 2 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 @@ -66,7 +66,6 @@ class ConnPoolImpl : Logger::Loggable<Logger::Id::pool>, public ConnectionPool::

void checkForDrained();
virtual CodecClientPtr createCodecClient(Upstream::Host::CreateConnectionData& data) PURE;
virtual uint64_t maxConcurrentStreams() PURE;
virtual uint32_t maxTotalStreams() PURE;
void movePrimaryClientToDraining();
void onConnectionEvent(ActiveClient& client, uint32_t events);
Expand All @@ -93,7 +92,6 @@ class ProdConnPoolImpl : public ConnPoolImpl {

private:
CodecClientPtr createCodecClient(Upstream::Host::CreateConnectionData& data) override;
uint64_t maxConcurrentStreams() override;
uint32_t maxTotalStreams() override;

// All streams are 2^31. Client streams are half that, minus stream 0. Just to be on the safe
Expand Down
22 changes: 0 additions & 22 deletions test/common/http/http2/conn_pool_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,8 @@ class TestConnPoolImpl : public ConnPoolImpl {

MOCK_METHOD1(createCodecClient_, CodecClient*(Upstream::Host::CreateConnectionData& data));

uint64_t maxConcurrentStreams() override { return max_concurrent_streams_; }
uint32_t maxTotalStreams() override { return max_streams_; }

uint64_t max_concurrent_streams_{std::numeric_limits<uint64_t>::max()};
uint32_t max_streams_{std::numeric_limits<uint32_t>::max()};
};

Expand Down Expand Up @@ -356,26 +354,6 @@ TEST_F(Http2ConnPoolImplTest, ConnectTimeout) {
EXPECT_EQ(1U, cluster_->stats_.upstream_rq_pending_failure_eject_.value());
}

TEST_F(Http2ConnPoolImplTest, MaxRequests) {
InSequence s;
pool_.max_concurrent_streams_ = 1;

expectClientCreate();
ActiveTestRequest r1(*this, 0);
EXPECT_CALL(r1.inner_encoder_, encodeHeaders(_, true));
r1.callbacks_.outer_encoder_->encodeHeaders(HeaderMapImpl{}, true);
expectClientConnect(0);

ConnPoolCallbacks callbacks;
Http::MockStreamDecoder decoder;
EXPECT_CALL(callbacks.pool_failure_, ready());
EXPECT_EQ(nullptr, pool_.newStream(decoder, callbacks));

test_clients_[0].connection_->raiseEvents(Network::ConnectionEvent::RemoteClose);
EXPECT_CALL(*this, onClientDestroy());
dispatcher_.clearDeferredDeleteList();
}

TEST_F(Http2ConnPoolImplTest, MaxGlobalRequests) {
InSequence s;
cluster_->resource_manager_.reset(
Expand Down