From 11dae350dad1cf4dcc8287ec0c4a8d9949cd9257 Mon Sep 17 00:00:00 2001 From: Otto van der Schaaf Date: Fri, 17 Apr 2020 23:41:28 +0200 Subject: [PATCH] Update Envoy to 582ab4a353ac2c19f4326115b471cebeabe7ae8a Signed-off-by: Otto van der Schaaf --- .bazelrc | 4 ++-- bazel/repositories.bzl | 4 ++-- source/client/process_impl.cc | 2 +- source/common/worker_impl.cc | 4 ++-- test/benchmark_http_client_test.cc | 3 ++- test/server/http_test_server_filter_integration_test.cc | 2 +- test/stream_decoder_test.cc | 3 ++- test/utility_test.cc | 4 ++-- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.bazelrc b/.bazelrc index 7f83d8173..88b939ce4 100644 --- a/.bazelrc +++ b/.bazelrc @@ -161,8 +161,8 @@ build:remote-msan --config=rbe-toolchain-clang-libc++ build:remote-msan --config=rbe-toolchain-msan # Docker sandbox -# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L7 -build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu@sha256:ebf534b8aa505e8ff5663a31eed782942a742ae4d656b54f4236b00399f17911 +# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8 +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:09a5a914c904faa39dbc641181cb43b68cabf626 build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index b198504e9..21dff258f 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,7 +1,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "8e8209fa75f87ab53d4c78a466c8f927df930e50" # April 10th, 2020 -ENVOY_SHA = "ef9661e7c0c446e4bf600adb9328f5e5e3088cb897380c7e991b7f743f811a10" +ENVOY_COMMIT = "582ab4a353ac2c19f4326115b471cebeabe7ae8a" # April 17th, 2020 +ENVOY_SHA = "fd019d30f45bbc781e5e95324e3b16abcd23beca19baf0aa762bd39c602ddac1" RULES_PYTHON_COMMIT = "dd7f9c5f01bafbfea08c44092b6b0c8fc8fcb77f" # Feb 22nd, 2020 RULES_PYTHON_SHA = "0aa9ec790a58053e3ab5af397879b267a625955f8297c239b2d8559c6773397b" diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 32adb91af..e25119a9a 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -101,7 +101,7 @@ ProcessImpl::ProcessImpl(const Options& options, Envoy::Event::TimeSystem& time_ : time_system_(time_system), stats_allocator_(symbol_table_), store_root_(stats_allocator_), api_(std::make_unique(platform_impl_.threadFactory(), store_root_, time_system_, platform_impl_.fileSystem())), - dispatcher_(api_->allocateDispatcher()), benchmark_client_factory_(options), + dispatcher_(api_->allocateDispatcher("main_thread")), benchmark_client_factory_(options), termination_predicate_factory_(options), sequencer_factory_(options), request_generator_factory_(options), options_(options), init_manager_("nh_init_manager"), local_info_(new Envoy::LocalInfo::LocalInfoImpl( diff --git a/source/common/worker_impl.cc b/source/common/worker_impl.cc index 5e59280c0..021a65f35 100644 --- a/source/common/worker_impl.cc +++ b/source/common/worker_impl.cc @@ -7,8 +7,8 @@ namespace Nighthawk { WorkerImpl::WorkerImpl(Envoy::Api::Api& api, Envoy::ThreadLocal::Instance& tls, Envoy::Stats::Store& store) - : thread_factory_(api.threadFactory()), dispatcher_(api.allocateDispatcher()), tls_(tls), - store_(store), time_source_(api.timeSource()) { + : thread_factory_(api.threadFactory()), dispatcher_(api.allocateDispatcher("worker_thread")), + tls_(tls), store_(store), time_source_(api.timeSource()) { tls.registerThread(*dispatcher_, false); } diff --git a/test/benchmark_http_client_test.cc b/test/benchmark_http_client_test.cc index 8800588f6..62a65cb60 100644 --- a/test/benchmark_http_client_test.cc +++ b/test/benchmark_http_client_test.cc @@ -28,7 +28,8 @@ namespace Nighthawk { class BenchmarkClientHttpTest : public Test { public: BenchmarkClientHttpTest() - : api_(Envoy::Api::createApiForTest(time_system_)), dispatcher_(api_->allocateDispatcher()), + : api_(Envoy::Api::createApiForTest(time_system_)), + dispatcher_(api_->allocateDispatcher("test_thread")), cluster_manager_(std::make_unique()), cluster_info_(std::make_unique()), http_tracer_(std::make_unique()), response_code_("200") { diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc index 768ccf9ae..d63977b76 100644 --- a/test/server/http_test_server_filter_integration_test.cc +++ b/test/server/http_test_server_filter_integration_test.cc @@ -40,7 +40,7 @@ class HttpTestServerIntegrationTestBase : public Envoy::HttpIntegrationTest, absl::string_view host, absl::string_view content_type, const std::function& request_header_delegate) { Envoy::Api::ApiPtr api = Envoy::Api::createApiForTest(); - Envoy::Event::DispatcherPtr dispatcher(api->allocateDispatcher()); + Envoy::Event::DispatcherPtr dispatcher(api->allocateDispatcher("test_thread")); std::shared_ptr cluster{ new NiceMock()}; Envoy::Upstream::HostDescriptionConstSharedPtr host_description{ diff --git a/test/stream_decoder_test.cc b/test/stream_decoder_test.cc index dd33cd053..3cba8b2c7 100644 --- a/test/stream_decoder_test.cc +++ b/test/stream_decoder_test.cc @@ -23,7 +23,8 @@ namespace Client { class StreamDecoderTest : public Test, public StreamDecoderCompletionCallback { public: StreamDecoderTest() - : api_(Envoy::Api::createApiForTest(time_system_)), dispatcher_(api_->allocateDispatcher()), + : api_(Envoy::Api::createApiForTest(time_system_)), + dispatcher_(api_->allocateDispatcher("test_thread")), request_headers_(std::make_shared( std::initializer_list>({{":method", "GET"}}))), http_tracer_(std::make_unique()), diff --git a/test/utility_test.cc b/test/utility_test.cc index 7ec2fb414..4d292d136 100644 --- a/test/utility_test.cc +++ b/test/utility_test.cc @@ -93,7 +93,7 @@ class UtilityAddressResolutionTest : public TestWithParamallocateDispatcher(); + auto dispatcher = api->allocateDispatcher("uri_resolution_thread"); auto u = UriImpl(uri); return u.resolve(*dispatcher, address_family); } @@ -142,7 +142,7 @@ TEST_P(UtilityAddressResolutionTest, ResolveTwiceReturnsCached) { : Envoy::Network::DnsLookupFamily::V4Only; Envoy::Api::ApiPtr api = Envoy::Api::createApiForTest(); - auto dispatcher = api->allocateDispatcher(); + auto dispatcher = api->allocateDispatcher("test_thread"); auto u = UriImpl("localhost"); EXPECT_EQ(u.resolve(*dispatcher, address_family).get(),