Skip to content

Fix construction order of ServiceImpl and RequestSourceServiceImpl. #877

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

Merged
mum4k merged 2 commits into from
Jul 18, 2022
Merged

Fix construction order of ServiceImpl and RequestSourceServiceImpl. #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57155a7
Fix construction order of Envoy::Logger::Context.
mum4k Jul 16, 2022
e809649
Fixing the order in RequestSourceServiceImpl as well.
mum4k Jul 16, 2022
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
18 changes: 18 additions & 0 deletions .azure-pipelines/pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,23 @@ stages:
parameters:
ciTarget: $(CI_TARGET)

- stage: test_gcc
dependsOn: ["check"]
pool: "x64-large"
jobs:
- job: test_gcc
displayName: "do_ci.sh"
strategy:
maxParallel: 1
matrix:
test_gcc:
CI_TARGET: "test_gcc"
timeoutInMinutes: 120
steps:
- template: bazel.yml
parameters:
ciTarget: $(CI_TARGET)

- stage: sanitizers
dependsOn: ["test"]
pool: "x64-large"
Expand Down Expand Up @@ -102,6 +119,7 @@ stages:
- stage: release
dependsOn:
- "clang_tidy"
- "test_gcc"
- "sanitizers"
- "coverage"
condition: eq(variables['PostSubmit'], true)
Expand Down
4 changes: 2 additions & 2 deletions source/client/service_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ class ServiceImpl final : public nighthawk::client::NighthawkService::Service,
void writeResponse(const nighthawk::client::ExecutionResponse& response);
grpc::Status finishGrpcStream(const bool success, absl::string_view description = "");

Envoy::Thread::MutexBasicLockable log_lock_;
std::unique_ptr<Envoy::Logger::Context> logging_context_;
std::shared_ptr<Envoy::ProcessWide> process_wide_;
Envoy::Event::RealTimeSystem time_system_; // NO_CHECK_FORMAT(real_time)
Envoy::Thread::MutexBasicLockable log_lock_;
grpc::ServerReaderWriter<nighthawk::client::ExecutionResponse,
nighthawk::client::ExecutionRequest>* stream_;
std::future<void> future_;
Expand Down Expand Up @@ -95,8 +95,8 @@ class RequestSourceServiceImpl final
nighthawk::request_source::RequestStreamRequest>* stream) override;

private:
std::unique_ptr<Envoy::Logger::Context> logging_context_;
Envoy::Thread::MutexBasicLockable log_lock_;
std::unique_ptr<Envoy::Logger::Context> logging_context_;
RequestSourcePtr createStaticEmptyRequestSource(const uint32_t amount);
};

Expand Down