From 33b1555b3762afcf4be38155d50a9364ae1f22a7 Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Mon, 12 Jul 2021 09:33:25 -0400 Subject: [PATCH 1/2] Update Envoy to 5ab509b (July 12th 2021) Signed-off-by: Nathan Perry --- bazel/repositories.bzl | 4 ++-- source/client/benchmark_client_impl.cc | 2 +- test/benchmark_http_client_test.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index d6058c7e4..446d3cdc6 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 = "d3a90127f8c408651e8ab44e961408ca1fd972b4" # July 07, 2021 -ENVOY_SHA = "4aed1171848e1cf4f5309d918b384b9d34aa1e7f577398caeb1d4f32c8004ee4" +ENVOY_COMMIT = "5ab509b54bf6916235b5f2b65800b9d756032129" # July 07, 2021 +ENVOY_SHA = "81f7e6142686cc3a9bcb5342ad97147b177d16a36546d8eab16c92abec0fa5e6" HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad" diff --git a/source/client/benchmark_client_impl.cc b/source/client/benchmark_client_impl.cc index 5be49b791..831f5e092 100644 --- a/source/client/benchmark_client_impl.cc +++ b/source/client/benchmark_client_impl.cc @@ -115,7 +115,7 @@ void BenchmarkClientHttpImpl::terminate() { // No harm is done, but it does result in log lines warning about it. Avoid that, by // disabling latency measurement here. setShouldMeasureLatencies(false); - pool_data.value().addDrainedCallback([this]() -> void { + pool_data.value().addIdleCallback([this]() -> void { drain_timer_->disableTimer(); dispatcher_.exit(); }); diff --git a/test/benchmark_http_client_test.cc b/test/benchmark_http_client_test.cc index 5100eca5a..348468de3 100644 --- a/test/benchmark_http_client_test.cc +++ b/test/benchmark_http_client_test.cc @@ -435,7 +435,7 @@ TEST_F(BenchmarkClientHttpTest, DrainTimeoutFires) { return nullptr; }); EXPECT_CALL(pool_, hasActiveConnections()).WillOnce([]() -> bool { return true; }); - EXPECT_CALL(pool_, addDrainedCallback(_)); + EXPECT_CALL(pool_, addIdleCallback(_)); // We don't expect the callback that we pass here to fire. client_->tryStartRequest([](bool, bool) { EXPECT_TRUE(false); }); // To get past this, the drain timeout within the benchmark client must execute. From 62cc47b4f9e5312cbb513a11869e66958b95fd9d Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Tue, 13 Jul 2021 13:13:40 -0400 Subject: [PATCH 2/2] Modify date in comment Signed-off-by: Nathan Perry --- bazel/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 446d3cdc6..8a67f487a 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,6 +1,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "5ab509b54bf6916235b5f2b65800b9d756032129" # July 07, 2021 +ENVOY_COMMIT = "5ab509b54bf6916235b5f2b65800b9d756032129" # July 12, 2021 ENVOY_SHA = "81f7e6142686cc3a9bcb5342ad97147b177d16a36546d8eab16c92abec0fa5e6" HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020