Skip to content

Revert "http: delaying filter stack creation until full headers have been created #3590

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
Jun 11, 2018
Merged

Revert "http: delaying filter stack creation until full headers have been created #3590

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
17 changes: 6 additions & 11 deletions source/common/http/conn_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@ StreamDecoder& ConnectionManagerImpl::newStream(StreamEncoder& response_encoder)
new_stream->response_encoder_ = &response_encoder;
new_stream->response_encoder_->getStream().addCallbacks(*new_stream);
new_stream->buffer_limit_ = new_stream->response_encoder_->getStream().bufferLimit();
config_.filterFactory().createFilterChain(*new_stream);
// Make sure new streams are apprised that the underlying connection is blocked.
if (read_callbacks_->connection().aboveHighWatermark()) {
new_stream->callHighWatermarkCallbacks();
}
new_stream->moveIntoList(std::move(new_stream), streams_);
return **streams_.begin();
}
Expand Down Expand Up @@ -440,10 +445,8 @@ const Network::Connection* ConnectionManagerImpl::ActiveStream::connection() {
}

void ConnectionManagerImpl::ActiveStream::decodeHeaders(HeaderMapPtr&& headers, bool end_stream) {
request_headers_ = std::move(headers);
createFilterChain();

maybeEndDecode(end_stream);
request_headers_ = std::move(headers);

ENVOY_STREAM_LOG(debug, "request headers complete (end_stream={}):\n{}", *this, end_stream,
*request_headers_);
Expand Down Expand Up @@ -1111,14 +1114,6 @@ void ConnectionManagerImpl::ActiveStream::setBufferLimit(uint32_t new_limit) {
}
}

void ConnectionManagerImpl::ActiveStream::createFilterChain() {
connection_manager_.config_.filterFactory().createFilterChain(*this);
// Make sure new streams are apprised that the underlying connection is blocked.
if (connection_manager_.read_callbacks_->connection().aboveHighWatermark()) {
callHighWatermarkCallbacks();
}
}

void ConnectionManagerImpl::ActiveStreamFilterBase::commonContinue() {
// TODO(mattklein123): Raise an error if this is called during a callback.
if (!canContinue()) {
Expand Down
2 changes: 0 additions & 2 deletions source/common/http/conn_manager_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,6 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,

// Possibly increases buffer_limit_ to the value of limit.
void setBufferLimit(uint32_t limit);
// Set up the Encoder/Decoder filter chain.
void createFilterChain();

ConnectionManagerImpl& connection_manager_;
Router::ConfigConstSharedPtr snapped_route_config_;
Expand Down
6 changes: 4 additions & 2 deletions test/common/http/conn_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,13 +1712,14 @@ TEST_F(HttpConnectionManagerImplTest, DownstreamDisconnect) {
data.drain(2);
}));

EXPECT_CALL(filter_factory_, createFilterChain(_)).Times(0);
setupFilterChain(1, 0);

// Kick off the incoming data.
Buffer::OwnedImpl fake_input("1234");
conn_manager_->onData(fake_input, false);

// Now raise a remote disconnection, we should see the filter get reset called.
EXPECT_CALL(*decoder_filters_[0], onDestroy());
conn_manager_->onEvent(Network::ConnectionEvent::RemoteClose);
}

Expand All @@ -1731,9 +1732,10 @@ TEST_F(HttpConnectionManagerImplTest, DownstreamProtocolError) {
throw CodecProtocolException("protocol error");
}));

EXPECT_CALL(filter_factory_, createFilterChain(_)).Times(0);
setupFilterChain(1, 0);

// A protocol exception should result in reset of the streams followed by a local close.
EXPECT_CALL(*decoder_filters_[0], onDestroy());
EXPECT_CALL(filter_callbacks_.connection_, close(Network::ConnectionCloseType::FlushWrite));

// Kick off the incoming data.
Expand Down