Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
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 = "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"
Expand Down
2 changes: 1 addition & 1 deletion source/client/process_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<Envoy::Api::Impl>(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(
Expand Down
4 changes: 2 additions & 2 deletions source/common/worker_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 2 additions & 1 deletion test/benchmark_http_client_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<Envoy::Upstream::MockClusterManager>()),
cluster_info_(std::make_unique<Envoy::Upstream::MockClusterInfo>()),
http_tracer_(std::make_unique<Envoy::Tracing::MockHttpTracer>()), response_code_("200") {
Expand Down
2 changes: 1 addition & 1 deletion test/server/http_test_server_filter_integration_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class HttpTestServerIntegrationTestBase : public Envoy::HttpIntegrationTest,
absl::string_view host, absl::string_view content_type,
const std::function<void(Envoy::Http::RequestHeaderMapImpl&)>& 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<Envoy::Upstream::MockClusterInfo> cluster{
new NiceMock<Envoy::Upstream::MockClusterInfo>()};
Envoy::Upstream::HostDescriptionConstSharedPtr host_description{
Expand Down
3 changes: 2 additions & 1 deletion test/stream_decoder_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<Envoy::Http::TestRequestHeaderMapImpl>(
std::initializer_list<std::pair<std::string, std::string>>({{":method", "GET"}}))),
http_tracer_(std::make_unique<Envoy::Tracing::HttpNullTracer>()),
Expand Down
4 changes: 2 additions & 2 deletions test/utility_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class UtilityAddressResolutionTest : public TestWithParam<Envoy::Network::Addres
Envoy::Network::Address::InstanceConstSharedPtr
testResolution(absl::string_view uri, Envoy::Network::DnsLookupFamily address_family) {
Envoy::Api::ApiPtr api = Envoy::Api::createApiForTest();
auto dispatcher = api->allocateDispatcher();
auto dispatcher = api->allocateDispatcher("uri_resolution_thread");
auto u = UriImpl(uri);
return u.resolve(*dispatcher, address_family);
}
Expand Down Expand Up @@ -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(),
Expand Down