Skip to content

Commit

Permalink
upstream: update Envoy to include new fixes (#663)
Browse files Browse the repository at this point in the history 
Bumping to include the following fixes:
- `dns: destroy/reinitialize c-ares channel on ARES_ECONNREFUSED`: envoyproxy/envoy#9899. This should resolve the issues we've been seeing with Envoy Mobile hanging on startup and never properly issuing requests if started in the offline state on iOS. Fixes #672, though more improvements to DNS resolution will be investigated in #673
- `gzip: add force load factory declaration`: envoyproxy/envoy#9942. This will allow us to use the gzip filter with Envoy Mobile
- `api listener: add shutdown method and call during server termination`: envoyproxy/envoy#9959. Fixes #667. Fixes #674

Includes the following PRs to fix iOS liveliness tests as well:
- `metrics service: force link v2 config`: envoyproxy/envoy#9875
- `config: remove ApiTypeOracle assert`: envoyproxy/envoy#9973

Also contains necessary updates to accommodate [this change](envoyproxy/envoy@dea4eb0).

Signed-off-by: Michael Rebello <me@michaelrebello.com>
  • Loading branch information
@rebello95
rebello95 authored Feb 10, 2020
1 parent 4b2ebe1 commit 1f33b23
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion envoy
Submodule envoy updated 714 files
8 changes: 4 additions & 4 deletions library/common/http/dispatcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ envoy_status_t Dispatcher::startStream(envoy_stream_t new_stream_handle,
std::make_unique<DirectStreamCallbacks>(*direct_stream, bridge_callbacks, *this);

// Only the initial setting of the api_listener_ is guarded.
direct_stream->stream_decoder_ =
direct_stream->request_decoder_ =
&TS_UNCHECKED_READ(api_listener_)->newStream(*direct_stream->callbacks_);

Thread::ReleasableLockGuard lock(streams_lock_);
Expand Down Expand Up @@ -290,7 +290,7 @@ envoy_status_t Dispatcher::sendHeaders(envoy_stream_t stream, envoy_headers head
ENVOY_LOG(debug, "[S{}] request headers for stream (end_stream={}):\n{}", stream, end_stream,
*internal_headers);
attachPreferredNetwork(*internal_headers);
direct_stream->stream_decoder_->decodeHeaders(std::move(internal_headers), end_stream);
direct_stream->request_decoder_->decodeHeaders(std::move(internal_headers), end_stream);
direct_stream->closeLocal(end_stream);
}
});
Expand All @@ -315,7 +315,7 @@ envoy_status_t Dispatcher::sendData(envoy_stream_t stream, envoy_data data, bool

ENVOY_LOG(debug, "[S{}] request data for stream (length={} end_stream={})\n", stream,
data.length, end_stream);
direct_stream->stream_decoder_->decodeData(*buf, end_stream);
direct_stream->request_decoder_->decodeData(*buf, end_stream);
direct_stream->closeLocal(end_stream);
}
});
Expand All @@ -340,7 +340,7 @@ envoy_status_t Dispatcher::sendTrailers(envoy_stream_t stream, envoy_headers tra
if (direct_stream) {
HeaderMapPtr internal_trailers = Utility::toInternalHeaders(trailers);
ENVOY_LOG(debug, "[S{}] request trailers for stream:\n{}", stream, *internal_trailers);
direct_stream->stream_decoder_->decodeTrailers(std::move(internal_trailers));
direct_stream->request_decoder_->decodeTrailers(std::move(internal_trailers));
direct_stream->closeLocal(true);
}
});
Expand Down
6 changes: 3 additions & 3 deletions library/common/http/dispatcher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Dispatcher : public Logger::Loggable<Logger::Id::http> {
* DirectStreamCallbacks can continue to receive events until the remote to local stream is
* closed, or resetStream is called.
*/
class DirectStreamCallbacks : public StreamEncoder, public Logger::Loggable<Logger::Id::http> {
class DirectStreamCallbacks : public ResponseEncoder, public Logger::Loggable<Logger::Id::http> {
public:
DirectStreamCallbacks(DirectStream& direct_stream, envoy_http_callbacks bridge_callbacks,
Dispatcher& http_dispatcher);
Expand All @@ -108,7 +108,7 @@ class Dispatcher : public Logger::Loggable<Logger::Id::http> {
void onCancel();
void closeRemote(bool end_stream);

// StreamEncoder
// ResponseEncoder
void encodeHeaders(const HeaderMap& headers, bool end_stream) override;
void encodeData(Buffer::Instance& data, bool end_stream) override;
void encodeTrailers(const HeaderMap& trailers) override;
Expand Down Expand Up @@ -181,7 +181,7 @@ class Dispatcher : public Logger::Loggable<Logger::Id::http> {
bool local_closed_{};

// Used to issue outgoing HTTP stream operations.
StreamDecoder* stream_decoder_;
RequestDecoder* request_decoder_;
// Used to receive incoming HTTP stream operations.
DirectStreamCallbacksPtr callbacks_;
Dispatcher& parent_;
Expand Down
40 changes: 20 additions & 20 deletions test/common/http/dispatcher_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class DispatcherTest : public testing::Test {
} callbacks_called;

MockApiListener api_listener_;
MockStreamDecoder request_decoder_;
StreamEncoder* response_encoder_{};
MockRequestDecoder request_decoder_;
ResponseEncoder* response_encoder_{};
NiceMock<Event::MockDispatcher> event_dispatcher_;
envoy_http_callbacks bridge_callbacks_;
std::atomic<envoy_network_t> preferred_network_{ENVOY_NET_GENERIC};
Expand Down Expand Up @@ -77,7 +77,7 @@ TEST_F(DispatcherTest, PreferredNetwork) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -190,7 +190,7 @@ TEST_F(DispatcherTest, BasicStreamHeadersOnly) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -261,7 +261,7 @@ TEST_F(DispatcherTest, BasicStream) {
// Return the request decoder to make sure calls are dispatched to the decoder via the
// dispatcher API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -347,7 +347,7 @@ TEST_F(DispatcherTest, MultipleDataStream) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -432,7 +432,7 @@ TEST_F(DispatcherTest, MultipleStreams) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand All @@ -448,8 +448,8 @@ TEST_F(DispatcherTest, MultipleStreams) {

// Start stream2.
// Setup bridge_callbacks to handle the response headers.
NiceMock<MockStreamDecoder> request_decoder2;
StreamEncoder* response_encoder2{};
NiceMock<MockRequestDecoder> request_decoder2;
ResponseEncoder* response_encoder2{};
envoy_http_callbacks bridge_callbacks2;
callbacks_called cc2 = {0, 0, 0, 0, 0};
bridge_callbacks2.context = &cc2;
Expand Down Expand Up @@ -480,7 +480,7 @@ TEST_F(DispatcherTest, MultipleStreams) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder2 = &encoder;
return request_decoder2;
}));
Expand Down Expand Up @@ -543,7 +543,7 @@ TEST_F(DispatcherTest, ResetStreamLocal) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -606,7 +606,7 @@ TEST_F(DispatcherTest, RemoteResetAfterStreamStart) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -668,7 +668,7 @@ TEST_F(DispatcherTest, StreamResetAfterOnComplete) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -740,7 +740,7 @@ TEST_F(DispatcherTest, ResetStreamLocalHeadersRemoteRaceLocalWins) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -829,7 +829,7 @@ TEST_F(DispatcherTest, ResetStreamLocalHeadersRemoteRemoteWinsDeletesStream) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -917,7 +917,7 @@ TEST_F(DispatcherTest, ResetStreamLocalHeadersRemoteRemoteWins) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -1007,7 +1007,7 @@ TEST_F(DispatcherTest, ResetStreamLocalResetRemoteRaceLocalWins) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -1093,7 +1093,7 @@ TEST_F(DispatcherTest, ResetStreamLocalResetRemoteRemoteWinsDeletesStream) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -1178,7 +1178,7 @@ TEST_F(DispatcherTest, ResetStreamLocalResetRemoteRemoteWins) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down Expand Up @@ -1249,7 +1249,7 @@ TEST_F(DispatcherTest, ResetWhenRemoteClosesBeforeLocal) {
// Return the request decoder to make sure calls are dispatched to the decoder via the dispatcher
// API.
EXPECT_CALL(api_listener_, newStream(_, _))
.WillOnce(Invoke([&](StreamEncoder& encoder, bool) -> StreamDecoder& {
.WillOnce(Invoke([&](ResponseEncoder& encoder, bool) -> RequestDecoder& {
response_encoder_ = &encoder;
return request_decoder_;
}));
Expand Down

0 comments on commit 1f33b23

Please sign in to comment.