diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/execution_api/remote/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/execution_api/remote/config.cpp | 106 | ||||
| -rw-r--r-- | src/buildtool/execution_api/remote/config.hpp | 16 | ||||
| -rw-r--r-- | src/buildtool/storage/config.hpp | 33 |
4 files changed, 148 insertions, 8 deletions
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index 2d08ff8e..7af331ab 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -67,6 +67,7 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["config"] , "hdrs": ["config.hpp"] + , "srcs": ["config.cpp"] , "deps": [ ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "type_safe_arithmetic"] diff --git a/src/buildtool/execution_api/remote/config.cpp b/src/buildtool/execution_api/remote/config.cpp new file mode 100644 index 00000000..4403730e --- /dev/null +++ b/src/buildtool/execution_api/remote/config.cpp @@ -0,0 +1,106 @@ +// Copyright 2023 Huawei Cloud Computing Technology Co., Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "src/buildtool/execution_api/remote/config.hpp" + +#include <exception> +#include <fstream> + +#include <nlohmann/json.hpp> + +[[nodiscard]] auto RemoteExecutionConfig::SetRemoteExecutionDispatch( + const std::filesystem::path& filename) noexcept -> bool { + nlohmann::json dispatch{}; + try { + std::ifstream fs(filename); + dispatch = nlohmann::json::parse(fs); + } catch (std::exception const& e) { + Logger::Log(LogLevel::Warning, + "Failed to read json file {}: {}", + filename.string(), + e.what()); + return false; + } + std::vector<std::pair<std::map<std::string, std::string>, ServerAddress>> + parsed{}; + try { + if (not dispatch.is_array()) { + Logger::Log(LogLevel::Warning, + "Endpoint configuration has to be a list of pairs, but " + "found {}", + dispatch.dump()); + return false; + } + for (auto const& entry : dispatch) { + if (not(entry.is_array() and entry.size() == 2)) { + Logger::Log( + LogLevel::Warning, + "Endpoint configuration has to be a list of pairs, but " + "found entry {}", + entry.dump()); + return false; + } + if (not entry[0].is_object()) { + Logger::Log(LogLevel::Warning, + "Property condition has to be given as an object, " + "but found {}", + entry[0].dump()); + return false; + } + std::map<std::string, std::string> props{}; + for (auto const& [k, v] : entry[0].items()) { + if (not v.is_string()) { + Logger::Log(LogLevel::Warning, + "Property condition has to be given as an " + "object of strings but found {}", + entry[0].dump()); + return false; + } + props.emplace(k, v.template get<std::string>()); + } + if (not entry[1].is_string()) { + Logger::Log( + LogLevel::Warning, + "Endpoint has to be specified as string (in the form " + "host:port), but found {}", + entry[1].dump()); + return false; + } + auto endpoint = ParseAddress(entry[1].template get<std::string>()); + if (not endpoint) { + Logger::Log(LogLevel::Warning, + "Failed to parse {} as endpoint.", + entry[1].dump()); + return false; + } + parsed.emplace_back(props, *endpoint); + } + } catch (std::exception const& e) { + Logger::Log(LogLevel::Warning, + "Failure analysing endpoint configuration {}: {}", + dispatch.dump(), + e.what()); + return false; + } + + try { + Instance().dispatch_ = parsed; + } catch (std::exception const& e) { + Logger::Log(LogLevel::Warning, + "Failure assigning the endpoint configuration: {}", + e.what()); + return false; + } + return true; +} diff --git a/src/buildtool/execution_api/remote/config.hpp b/src/buildtool/execution_api/remote/config.hpp index 0b028035..55c96a46 100644 --- a/src/buildtool/execution_api/remote/config.hpp +++ b/src/buildtool/execution_api/remote/config.hpp @@ -16,12 +16,14 @@ #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_REMOTE_CONFIG_HPP #include <cstdint> +#include <filesystem> #include <map> #include <optional> #include <sstream> #include <stdexcept> #include <string> #include <utility> +#include <vector> #include <fmt/core.h> #include <nlohmann/json.hpp> @@ -84,6 +86,10 @@ class RemoteExecutionConfig { ParseAddress(address)); } + // Set remote-execution dispatch property list + [[nodiscard]] static auto SetRemoteExecutionDispatch( + const std::filesystem::path& filename) noexcept -> bool; + // Set specific cache address, unsets if parsing `address` fails [[nodiscard]] static auto SetCacheAddress( std::string const& address) noexcept -> bool { @@ -114,6 +120,12 @@ class RemoteExecutionConfig { return Instance().cache_address_; } + // Instance dispatch list + [[nodiscard]] static auto DispatchList() noexcept -> std::vector< + std::pair<std::map<std::string, std::string>, ServerAddress>> { + return Instance().dispatch_; + } + [[nodiscard]] static auto PlatformProperties() noexcept -> std::map<std::string, std::string> { return Instance().platform_properties_; @@ -123,6 +135,10 @@ class RemoteExecutionConfig { // Server address of remote execution. std::optional<ServerAddress> remote_address_{}; + // Server dispatch data + std::vector<std::pair<std::map<std::string, std::string>, ServerAddress>> + dispatch_{}; + // Server address of cache endpoint for rebuild. std::optional<ServerAddress> cache_address_{}; diff --git a/src/buildtool/storage/config.hpp b/src/buildtool/storage/config.hpp index dd569c46..884dae48 100644 --- a/src/buildtool/storage/config.hpp +++ b/src/buildtool/storage/config.hpp @@ -28,7 +28,6 @@ #include <string> #include <vector> -#include <fmt/core.h> #include <nlohmann/json.hpp> #include "src/buildtool/common/artifact_digest.hpp" @@ -137,19 +136,37 @@ class StorageConfig { -> std::string { auto address = RemoteExecutionConfig::RemoteAddress(); auto properties = RemoteExecutionConfig::PlatformProperties(); + auto dispatch = RemoteExecutionConfig::DispatchList(); + auto description = nlohmann::json{ + {"remote_address", address ? address->ToJson() : nlohmann::json{}}, + {"platform_properties", properties}}; + if (!dispatch.empty()) { + try { + // only add the dispatch list, if not empty, so that keys remain + // not only more readable, but also backwards compatible with + // earlier versions. + auto dispatch_list = nlohmann::json::array(); + for (auto const& [props, endpoint] : dispatch) { + auto entry = nlohmann::json::array(); + entry.push_back(nlohmann::json(props)); + entry.push_back(endpoint.ToJson()); + dispatch_list.push_back(entry); + } + description["endpoint dispatch list"] = dispatch_list; + } catch (std::exception const& e) { + Logger::Log(LogLevel::Error, + "Failed to serialize endpoint dispatch list: {}", + e.what()); + } + } try { // json::dump with json::error_handler_t::replace will not throw an // exception if invalid UTF-8 sequences are detected in the input. // Instead, it will replace them with the UTF-8 replacement // character, but still it needs to be inside a try-catch clause to // ensure the noexcept modifier of the enclosing function. - return nlohmann::json{ - {"remote_address", - address ? nlohmann::json{fmt::format( - "{}:{}", address->host, address->port)} - : nlohmann::json{}}, - {"platform_properties", properties}} - .dump(2, ' ', false, nlohmann::json::error_handler_t::replace); + return description.dump( + 2, ' ', false, nlohmann::json::error_handler_t::replace); } catch (...) { return ""; } |