diff options
Diffstat (limited to 'src/buildtool/execution_api')
5 files changed, 17 insertions, 13 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index 8bf4dc79..f0544913 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -14,7 +14,7 @@ ] , "private-deps": [ ["@", "fmt", "", "fmt"] - , ["src/buildtool/storage", "storage"] + , ["src/buildtool/storage", "config"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , "operation_cache" @@ -37,7 +37,7 @@ , ["src/buildtool/storage", "storage"] ] , "private-deps": - [ ["src/buildtool/storage", "storage"] + [ ["src/buildtool/storage", "config"] , ["src/buildtool/logging", "log_level"] , ["src/utils/cpp", "verify_hash"] ] @@ -59,7 +59,7 @@ [ ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/logging", "log_level"] , ["@", "fmt", "", "fmt"] - , ["src/buildtool/storage", "storage"] + , ["src/buildtool/storage", "config"] , ["src/utils/cpp", "verify_hash"] , "cas_utils" ] @@ -107,7 +107,7 @@ , ["src/buildtool/logging", "log_level"] , ["src/utils/cpp", "tmp_dir"] , ["@", "fmt", "", "fmt"] - , ["src/buildtool/storage", "storage"] + , ["src/buildtool/storage", "config"] , ["src/utils/cpp", "verify_hash"] ] } diff --git a/src/buildtool/execution_api/execution_service/ac_server.cpp b/src/buildtool/execution_api/execution_service/ac_server.cpp index d998bd6d..8b0a216e 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.cpp +++ b/src/buildtool/execution_api/execution_service/ac_server.cpp @@ -16,6 +16,7 @@ #include "fmt/core.h" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" @@ -30,7 +31,7 @@ auto ActionCacheServiceImpl::GetActionResult( logger_.Emit(LogLevel::Trace, "GetActionResult: {}", request->action_digest().hash()); - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, str); diff --git a/src/buildtool/execution_api/execution_service/bytestream_server.cpp b/src/buildtool/execution_api/execution_service/bytestream_server.cpp index 92b06ef6..35ff221d 100644 --- a/src/buildtool/execution_api/execution_service/bytestream_server.cpp +++ b/src/buildtool/execution_api/execution_service/bytestream_server.cpp @@ -23,6 +23,7 @@ #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/common/bytestream_common.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/tmp_dir.hpp" #include "src/utils/cpp/verify_hash.hpp" @@ -61,7 +62,7 @@ auto BytestreamServiceImpl::Read( return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, *error_msg}; } - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, str); @@ -125,7 +126,7 @@ auto BytestreamServiceImpl::Write( *hash, request.write_offset(), request.finish_write()); - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, str); diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp index c4cf8f6f..7d87ae75 100644 --- a/src/buildtool/execution_api/execution_service/cas_server.cpp +++ b/src/buildtool/execution_api/execution_service/cas_server.cpp @@ -27,6 +27,7 @@ #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/execution_service/cas_utils.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" @@ -62,7 +63,7 @@ auto CASServiceImpl::FindMissingBlobs( ::grpc::ServerContext* /*context*/, const ::bazel_re::FindMissingBlobsRequest* request, ::bazel_re::FindMissingBlobsResponse* response) -> ::grpc::Status { - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("FindMissingBlobs: could not acquire SharedLock"); @@ -119,7 +120,7 @@ auto CASServiceImpl::BatchUpdateBlobs( ::grpc::ServerContext* /*context*/, const ::bazel_re::BatchUpdateBlobsRequest* request, ::bazel_re::BatchUpdateBlobsResponse* response) -> ::grpc::Status { - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("BatchUpdateBlobs: could not acquire SharedLock"); @@ -183,7 +184,7 @@ auto CASServiceImpl::BatchReadBlobs( ::grpc::ServerContext* /*context*/, const ::bazel_re::BatchReadBlobsRequest* request, ::bazel_re::BatchReadBlobsResponse* response) -> ::grpc::Status { - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("BatchReadBlobs: Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, "{}", str); @@ -265,7 +266,7 @@ auto CASServiceImpl::SplitBlob(::grpc::ServerContext* /*context*/, } // Acquire garbage collection lock. - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (not lock) { auto str = fmt::format("SplitBlob: could not acquire garbage collection lock"); @@ -331,7 +332,7 @@ auto CASServiceImpl::SpliceBlob(::grpc::ServerContext* /*context*/, request->chunk_digests().size()); // Acquire garbage collection lock. - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (not lock) { auto str = fmt::format( "SpliceBlob: could not acquire garbage collection lock"); diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp index b71380f5..ef00677e 100644 --- a/src/buildtool/execution_api/execution_service/execution_server.cpp +++ b/src/buildtool/execution_api/execution_service/execution_server.cpp @@ -25,6 +25,7 @@ #include "src/buildtool/execution_api/execution_service/operation_cache.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" @@ -446,7 +447,7 @@ auto ExecutionServiceImpl::Execute( const ::bazel_re::ExecuteRequest* request, ::grpc::ServerWriter<::google::longrunning::Operation>* writer) -> ::grpc::Status { - auto lock = GarbageCollector::SharedLock(); + auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); if (!lock) { auto str = fmt::format("Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, str); |