diff options
Diffstat (limited to 'src/buildtool/execution_api')
5 files changed, 17 insertions, 9 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index a96727ab..01c152c8 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -51,7 +51,8 @@ , ["src/buildtool/storage", "storage"] ] , "private-deps": - [ ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + [ ["src/buildtool/common/remote", "retry_config"] + , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/execution_api/remote", "bazel"] ] diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp index 7cb307eb..ba4a434c 100644 --- a/src/buildtool/execution_api/common/api_bundle.cpp +++ b/src/buildtool/execution_api/common/api_bundle.cpp @@ -14,6 +14,7 @@ #include "src/buildtool/execution_api/common/api_bundle.hpp" +#include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" @@ -38,8 +39,12 @@ auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const if (address) { ExecutionConfiguration config; config.skip_cache_lookup = false; - return std::make_shared<BazelApi>( - "remote-execution", address->host, address->port, &auth, config); + return std::make_shared<BazelApi>("remote-execution", + address->host, + address->port, + &auth, + &RetryConfig::Instance(), + config); } return local; } diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index e8df48db..ad4093f3 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -67,12 +67,13 @@ , "srcs": ["bazel/bazel_api.cpp"] , "deps": [ "config" - , ["src/buildtool/auth", "auth"] - , ["src/buildtool/execution_api/common", "common"] - , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["@", "gsl", "", "gsl"] + , ["src/buildtool/auth", "auth"] , ["src/buildtool/common", "common"] , ["src/buildtool/common/remote", "port"] + , ["src/buildtool/common/remote", "retry_config"] + , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/common", "common_api"] ] , "stage": ["src", "buildtool", "execution_api", "remote"] @@ -80,7 +81,6 @@ [ "bazel_network" , ["@", "fmt", "", "fmt"] , ["src/buildtool/auth", "auth"] - , ["src/buildtool/common/remote", "retry_config"] , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/execution_api/common", "common"] diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index fd109003..f3635a5f 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -27,7 +27,6 @@ #include "fmt/core.h" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/bazel_types.hpp" -#include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" @@ -193,9 +192,10 @@ BazelApi::BazelApi(std::string const& instance_name, std::string const& host, Port port, gsl::not_null<Auth const*> const& auth, + gsl::not_null<RetryConfig const*> const& retry_config, ExecutionConfiguration const& exec_config) noexcept { network_ = std::make_shared<BazelNetwork>( - instance_name, host, port, auth, &RetryConfig::Instance(), exec_config); + instance_name, host, port, auth, retry_config, exec_config); } // implement move constructor in cpp, where all members are complete types diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp index 8a0ddcf9..5307ffd0 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.hpp @@ -28,6 +28,7 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/remote/port.hpp" +#include "src/buildtool/common/remote/retry_config.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/common/blob_tree.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" @@ -44,6 +45,7 @@ class BazelApi final : public IExecutionApi { std::string const& host, Port port, gsl::not_null<Auth const*> const& auth, + gsl::not_null<RetryConfig const*> const& retry_config, ExecutionConfiguration const& exec_config) noexcept; BazelApi(BazelApi const&) = delete; BazelApi(BazelApi&& other) noexcept; |