Pass RetryConfig instance to ApiBundle

Also store a const ref for usage in setting up a fresh ApiBundle
during target serve.

9 files changed, 23 insertions, 5 deletions

diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 01c152c8..a7cfd64c 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -45,14 +45,14 @@
     , ["src/buildtool/auth", "auth"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common/remote", "remote_common"]
+    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/execution_api/local", "config"]
     , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/storage", "config"]
     , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
-    [ ["src/buildtool/common/remote", "retry_config"]
-    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+    [ ["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 ba4a434c..38255f9a 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -25,13 +25,15 @@ ApiBundle::ApiBundle(
     gsl::not_null<LocalExecutionConfig const*> const& local_exec_config,
     RepositoryConfig const* repo_config,
     gsl::not_null<Auth const*> const& authentication,
+    gsl::not_null<RetryConfig const*> const& retry_config,
     gsl::not_null<RemoteExecutionConfig const*> const& remote_exec_config)
     : local{std::make_shared<LocalApi>(storage_config,
                                        storage,
                                        local_exec_config,
                                        repo_config)},  // needed by remote
       auth{*authentication},                           // needed by remote
-      remote_config{*remote_exec_config},              // needed by remote
+      retry_config{*retry_config},                     // needed by remote
+      remote_config{*remote_exec_config},
       remote{CreateRemote(remote_exec_config->remote_address)} {}
 
 auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const
@@ -43,7 +45,7 @@ auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const
                                           address->host,
                                           address->port,
                                           &auth,
-                                          &RetryConfig::Instance(),
+                                          &retry_config,
                                           config);
     }
     return local;
diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp
index 017154c1..5414423e 100644
--- a/src/buildtool/execution_api/common/api_bundle.hpp
+++ b/src/buildtool/execution_api/common/api_bundle.hpp
@@ -21,6 +21,7 @@
 #include "gsl/gsl"
 #include "src/buildtool/auth/authentication.hpp"
 #include "src/buildtool/common/remote/remote_common.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
@@ -38,6 +39,7 @@ struct ApiBundle final {
         gsl::not_null<LocalExecutionConfig const*> const& local_exec_config,
         RepositoryConfig const* repo_config,
         gsl::not_null<Auth const*> const& authentication,
+        gsl::not_null<RetryConfig const*> const& retry_config,
         gsl::not_null<RemoteExecutionConfig const*> const& remote_exec_config);
 
     [[nodiscard]] auto CreateRemote(std::optional<ServerAddress> const& address)
@@ -45,7 +47,8 @@ struct ApiBundle final {
 
     gsl::not_null<IExecutionApi::Ptr> const local;  // needed by remote
     Auth const& auth;                               // needed by remote
-    RemoteExecutionConfig const& remote_config;     // needed by remote
+    RetryConfig const& retry_config;                // needed by remote
+    RemoteExecutionConfig const& remote_config;
     gsl::not_null<IExecutionApi::Ptr> const remote;
 };
 
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 1d6dafeb..3960d6e6 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -70,6 +70,7 @@
 #ifndef BOOTSTRAP_BUILD_TOOL
 #include "fmt/core.h"
 #include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/execution_service/server_implementation.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
@@ -839,6 +840,7 @@ auto main(int argc, char* argv[]) -> int {
                                       &*local_exec_config,
                                       /*repo_config=*/nullptr,
                                       &*auth_config,
+                                      &RetryConfig::Instance(),
                                       &remote_exec_config};
             if (not ServerImpl::Instance().Run(*storage_config,
                                                storage,
@@ -893,6 +895,7 @@ auto main(int argc, char* argv[]) -> int {
                                            &*local_exec_config,
                                            /*repo_config=*/nullptr,
                                            &*auth_config,
+                                           &RetryConfig::Instance(),
                                            &*remote_exec_config};
                 auto serve =
                     ServeApi::Create(*serve_config, &storage, &serve_apis);
@@ -984,6 +987,7 @@ auto main(int argc, char* argv[]) -> int {
                                   &*local_exec_config,
                                   &repo_config,
                                   &*auth_config,
+                                  &RetryConfig::Instance(),
                                   &*remote_exec_config};
         GraphTraverser const traverser{
             {jobs,
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS
index 69cdb5ae..936ccc43 100644
--- a/src/buildtool/serve_api/serve_service/TARGETS
+++ b/src/buildtool/serve_api/serve_service/TARGETS
@@ -105,6 +105,7 @@
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/build_engine/target_map", "result_map"]
     , ["src/buildtool/common/remote", "remote_common"]
+    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/graph_traverser", "graph_traverser"]
diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp
index dd430ace..45c78946 100644
--- a/src/buildtool/serve_api/serve_service/target.cpp
+++ b/src/buildtool/serve_api/serve_service/target.cpp
@@ -25,6 +25,7 @@
 #include "src/buildtool/build_engine/target_map/configured_target.hpp"
 #include "src/buildtool/build_engine/target_map/result_map.hpp"
 #include "src/buildtool/common/artifact.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/common/repository_config.hpp"
 #include "src/buildtool/common/statistics.hpp"
 #include "src/buildtool/execution_api/remote/config.hpp"
@@ -480,6 +481,7 @@ auto TargetService::ServeTarget(
                                    &local_exec_config_,
                                    &repository_config,
                                    &apis_.auth,
+                                   &apis_.retry_config,
                                    &apis_.remote_config};
         GraphTraverser const traverser{
             std::move(traverser_args),
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index 3b4a3df6..62cef00f 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -117,6 +117,7 @@
     [ ["@", "fmt", "", "fmt"]
     , ["@", "json", "", "json"]
     , ["src/buildtool/auth", "auth"]
+    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , "exit_codes"
@@ -177,6 +178,7 @@
   , "private-deps":
     [ ["@", "json", "", "json"]
     , ["src/buildtool/auth", "auth"]
+    , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/multithreading", "task_system"]
     , ["src/buildtool/storage", "fs_utils"]
diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp
index 8798c371..9774f0d6 100644
--- a/src/other_tools/just_mr/fetch.cpp
+++ b/src/other_tools/just_mr/fetch.cpp
@@ -21,6 +21,7 @@
 #include "fmt/core.h"
 #include "nlohmann/json.hpp"
 #include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
@@ -423,6 +424,7 @@ auto MultiRepoFetch(std::shared_ptr<Configuration> const& config,
                          &*local_exec_config,
                          /*repo_config=*/nullptr,
                          &*auth_config,
+                         &RetryConfig::Instance(),
                          &*remote_exec_config};
 
     bool const has_remote_api =
diff --git a/src/other_tools/just_mr/setup.cpp b/src/other_tools/just_mr/setup.cpp
index 228c0ee0..40bdf3ad 100644
--- a/src/other_tools/just_mr/setup.cpp
+++ b/src/other_tools/just_mr/setup.cpp
@@ -23,6 +23,7 @@
 
 #include "nlohmann/json.hpp"
 #include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/execution_api/common/api_bundle.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
@@ -141,6 +142,7 @@ auto MultiRepoSetup(std::shared_ptr<Configuration> const& config,
                          &*local_exec_config,
                          /*repo_config=*/nullptr,
                          &*auth_config,
+                         &RetryConfig::Instance(),
                          &*remote_exec_config};
 
     bool const has_remote_api =