BlockStorage/repertory
1
0
Fork 0
Code Issues 1 Pull Requests Releases 8 Wiki Activity

fix intermintent hang on remote server disconnect
All checks were successful
Blockstorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves
2025-09-20 21:06:00 -05:00
parent bee018a563
commit 8e3c7d4eeb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
repertory/librepertory/include/common.hpp
View File

@@ -58,7 +58,7 @@ inline constexpr std::string_view REPERTORY{"repertory"};
inline constexpr std::string_view REPERTORY_DATA_NAME{"repertory2"}; inline constexpr std::string_view REPERTORY_DATA_NAME{"repertory2"};
inline constexpr std::wstring_view REPERTORY_W{L"repertory"}; inline constexpr std::wstring_view REPERTORY_W{L"repertory"};
inline constexpr std::uint64_t REPERTORY_CONFIG_VERSION{4ULL}; inline constexpr std::uint64_t REPERTORY_CONFIG_VERSION{5ULL};
inline constexpr std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.1.0"}; inline constexpr std::string_view REPERTORY_MIN_REMOTE_VERSION{"2.1.0"};
inline constexpr std::string_view RENTERD_MIN_VERSION{"2.0.0"}; inline constexpr std::string_view RENTERD_MIN_VERSION{"2.0.0"};

6
repertory/librepertory/include/types/remote.hpp
View File

@@ -37,8 +37,8 @@ inline constexpr auto default_remote_client_pool_size{20U};
inline constexpr auto default_remote_conn_timeout_ms{3000U}; inline constexpr auto default_remote_conn_timeout_ms{3000U};
inline constexpr auto default_remote_directory_page_size{std::size_t(100U)}; inline constexpr auto default_remote_directory_page_size{std::size_t(100U)};
inline constexpr auto default_remote_max_connections{20U}; inline constexpr auto default_remote_max_connections{20U};
inline constexpr auto default_remote_recv_timeout_ms{3000U}; inline constexpr auto default_remote_recv_timeout_ms{6000U};
inline constexpr auto default_remote_send_timeout_ms{1500U}; inline constexpr auto default_remote_send_timeout_ms{6000U};
namespace repertory::remote { namespace repertory::remote {
struct remote_config final { struct remote_config final {
@@ -231,7 +231,7 @@ template <> struct adl_serializer<repertory::remote::remote_config> {
static void to_json(json &data, static void to_json(json &data,
const repertory::remote::remote_config &value) { const repertory::remote::remote_config &value) {
data[repertory::JSON_API_PORT] = value.api_port; data[repertory::JSON_API_PORT] = value.api_port;
data[repertory::JSON_CONNECT_TIMEOUT_MS] = value.api_port; data[repertory::JSON_CONNECT_TIMEOUT_MS] = value.conn_timeout_ms;
data[repertory::JSON_ENCRYPTION_TOKEN] = value.encryption_token; data[repertory::JSON_ENCRYPTION_TOKEN] = value.encryption_token;
data[repertory::JSON_HOST_NAME_OR_IP] = value.host_name_or_ip; data[repertory::JSON_HOST_NAME_OR_IP] = value.host_name_or_ip;
data[repertory::JSON_MAX_CONNECTIONS] = value.max_connections; data[repertory::JSON_MAX_CONNECTIONS] = value.max_connections;

2
repertory/librepertory/src/app_config.cpp
View File

@@ -1097,7 +1097,7 @@ auto app_config::load() -> bool {
} }
} }
if (version_ == 3U || version_ == 4U) { if (version_ >= 3U && version_ <= 5U) {
if (json_document.contains(JSON_REMOTE_CONFIG)) { if (json_document.contains(JSON_REMOTE_CONFIG)) {
auto cfg = get_remote_config(); auto cfg = get_remote_config();
cfg.conn_timeout_ms = default_remote_conn_timeout_ms; cfg.conn_timeout_ms = default_remote_conn_timeout_ms;