Skip to content

Update Envoy to 295aba4 (Aug 16 2021) #733

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

Closed
qqustc wants to merge 1 commit into from
Closed

Update Envoy to 295aba4 (Aug 16 2021) #733

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
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "e85a7f408c7baee8e1ed4af39a647c98ee5f2215" # Aug 10, 2021
ENVOY_SHA = "1745bf00a464327a0993b5229cae5e30423854a77b9b1d0c4ee96306e9aedc64"
ENVOY_COMMIT = "295aba41b3844179a532541f0420be9dec673d8c" # Aug 16, 2021
ENVOY_SHA = "6140520c497ec819891ad01bbd7659b217149da690e8ebab9b620985b111e40d"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
4 changes: 2 additions & 2 deletions source/client/process_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ ProcessImpl::ProcessImpl(const Options& options, Envoy::Event::TimeSystem& time_
time_system_(time_system), stats_allocator_(symbol_table_), store_root_(stats_allocator_),
quic_stat_names_(store_root_.symbolTable()),
api_(std::make_unique<Envoy::Api::Impl>(platform_impl_.threadFactory(), store_root_,
time_system_, platform_impl_.fileSystem(),
generator_)),
time_system_, platform_impl_.fileSystem(), generator_,
bootstrap_)),
dispatcher_(api_->allocateDispatcher("main_thread")), benchmark_client_factory_(options),
termination_predicate_factory_(options), sequencer_factory_(options),
request_generator_factory_(options, *api_), options_(options),
Expand Down
1 change: 1 addition & 0 deletions source/client/process_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class ProcessImpl : public Process, public Envoy::Logger::Loggable<Envoy::Logger
Envoy::ThreadLocal::InstanceImpl tls_;
Envoy::Stats::ThreadLocalStoreImpl store_root_;
Envoy::Quic::QuicStatNames quic_stat_names_;
envoy::config::bootstrap::v3::Bootstrap bootstrap_;
Copy link
Copy Markdown
Member

@oschaaf oschaaf Aug 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do construct a bootstrap:

nighthawk/source/client/process_impl.cc

Line 405 in d05a0c9

absl::StatusOr<envoy::config::bootstrap::v3::Bootstrap> bootstrap =

Does the bootstrap that we need to start passing into the Api constructor in this PR need to be in sync with that?

Copy link
Copy Markdown
Contributor Author

@qqustc qqustc Aug 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks Otto. I'm not aware about that, currently Api::Impl does not modify the passed in bootstrap. Anyway, I think it is a good idea to pass in the existing bootstrap, will update the PR

Envoy::Api::ApiPtr api_;
Envoy::Event::DispatcherPtr dispatcher_;
std::vector<ClientWorkerPtr> workers_;
Expand Down