From f8d419debc9744951a9952f327f53b07ce16ae58 Mon Sep 17 00:00:00 2001 From: Otto van der Schaaf Date: Sat, 3 Oct 2020 00:25:54 +0200 Subject: [PATCH] Update Envoy to c318156496edc46c844822a3d1f107ee496fa449 Signed-off-by: Otto van der Schaaf --- .bazelrc | 7 ++----- .circleci/config.yml | 4 ++-- bazel/repositories.bzl | 4 ++-- source/client/process_impl.cc | 5 +++-- test/server/http_test_server_filter_integration_test.cc | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.bazelrc b/.bazelrc index 12995e93c..0a6a7bd47 100644 --- a/.bazelrc +++ b/.bazelrc @@ -43,9 +43,6 @@ build --action_env=CXX build --action_env=LLVM_CONFIG build --action_env=PATH -# Skip system ICU linking. -build --@com_googlesource_googleurl//build_config:system_icu=0 - # Common flags for sanitizers build:sanitizer --define tcmalloc=disabled build:sanitizer --linkopt -ldl @@ -149,7 +146,7 @@ build:coverage --strategy=CoverageReport=sandboxed,local build:coverage --experimental_use_llvm_covmap build:coverage --collect_code_coverage build:coverage --test_tag_filters=-nocoverage -build:coverage --instrumentation_filter="//source(?!/extensions/quic_listeners/quiche/platform)[/:],//include[/:]" +build:coverage --instrumentation_filter="//source(?!/common/chromium_url|/extensions/quic_listeners/quiche/platform)[/:],//include[/:]" coverage:test-coverage --test_arg="-l trace" coverage:fuzz-coverage --config=plain-fuzzer coverage:fuzz-coverage --run_under=@envoy//bazel/coverage:fuzz_coverage_wrapper.sh @@ -238,7 +235,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl # Docker sandbox # 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:e7ea4e81bbd5028abb9d3a2f2c0afe063d9b62c0 +build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:1526786b8f5cfce7a40829a0c527b5a27570889c build:docker-sandbox --spawn_strategy=docker build:docker-sandbox --strategy=Javac=docker build:docker-sandbox --strategy=Closure=docker diff --git a/.circleci/config.yml b/.circleci/config.yml index e34bc1422..a5b8b130b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ references: - envoy-build-image: &envoy-build-image # September 9th, 2020 - envoyproxy/envoy-build-ubuntu:e7ea4e81bbd5028abb9d3a2f2c0afe063d9b62c0 + envoy-build-image: &envoy-build-image # October 2nd, 2020 + envoyproxy/envoy-build-ubuntu:1526786b8f5cfce7a40829a0c527b5a27570889c version: 2 jobs: build: diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 51e9f0566..7b8ff6d20 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 = "5a87f1e59b42ad546698d389f6ccac9406534e17" # September 25th, 2020 -ENVOY_SHA = "739c62249bae60f633f91dee846825f1d5ddcc469d45ef370e57f1a010c13258" +ENVOY_COMMIT = "c318156496edc46c844822a3d1f107ee496fa449" # October 2nd, 2020 +ENVOY_SHA = "dc4ee70d317f0310b96cb803a5c02b42589f5d1dfbfb2989f4bf72800aaa799a" HDR_HISTOGRAM_C_VERSION = "0.11.1" # September 17th, 2020 HDR_HISTOGRAM_C_SHA = "8550071d4ae5c8229448f9b68469d6d42c620cd25111b49c696d00185e5f8329" diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 28f11e610..e6bfcf406 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -72,7 +72,7 @@ class ClusterManagerFactory : public Envoy::Upstream::ProdClusterManagerFactory const Envoy::Network::TransportSocketOptionsSharedPtr& transport_socket_options) override { if (protocol == Envoy::Http::Protocol::Http11 || protocol == Envoy::Http::Protocol::Http10) { auto* h1_pool = - new Http1PoolImpl(dispatcher, host, priority, options, transport_socket_options); + new Http1PoolImpl(dispatcher, random_, host, priority, options, transport_socket_options); h1_pool->setConnectionReuseStrategy(connection_reuse_strategy_); h1_pool->setPrefetchConnections(prefetch_connections_); return Envoy::Http::ConnectionPool::InstancePtr{h1_pool}; @@ -100,7 +100,8 @@ ProcessImpl::ProcessImpl(const Options& options, Envoy::Event::TimeSystem& time_ : process_wide), 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())), + time_system_, platform_impl_.fileSystem(), + generator_)), 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"), diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc index 702b77c3c..3ae792d0c 100644 --- a/test/server/http_test_server_filter_integration_test.cc +++ b/test/server/http_test_server_filter_integration_test.cc @@ -52,7 +52,7 @@ class HttpTestServerIntegrationTestBase : public Envoy::HttpIntegrationTest, type, dispatcher->createClientConnection(addr, Envoy::Network::Address::InstanceConstSharedPtr(), Envoy::Network::Test::createRawBufferSocket(), nullptr), - host_description, *dispatcher); + host_description, *dispatcher, random_); Envoy::BufferingStreamDecoderPtr response( new Envoy::BufferingStreamDecoder([&client, &dispatcher]() -> void { client.close();