thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wait for OSDs to either connect or stop infinitely during listing, not for peer_connect_timeout

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-01-01 15:29:42 +03:00
parent 80dda3ca94
commit 4edda88903
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/cluster_client.cpp
+3 -6
View File
@@ -409,18 +409,15 @@ void cluster_client_t::on_load_config_hook(json11::Json::object & etcd_global_co
}
// client_retry_enospc
client_retry_enospc = config["client_retry_enospc"].is_null() ? true : config["client_retry_enospc"].bool_value();
// peer_connect_timeout, wait_up_timeout
peer_connect_timeout = config["peer_connect_timeout"].uint64_value();
if (!peer_connect_timeout)
peer_connect_timeout = 5;
// client_wait_up_timeout
if (!config["client_wait_up_timeout"].is_null())
wait_up_timeout = config["client_wait_up_timeout"].uint64_value();
client_wait_up_timeout = config["client_wait_up_timeout"].uint64_value();
else
{
auto etcd_report_interval = config["etcd_report_interval"].uint64_value();
if (!etcd_report_interval)
etcd_report_interval = 5;
wait_up_timeout = 1+etcd_report_interval+(st_cli.max_etcd_attempts*(2*st_cli.etcd_quick_timeout)+999)/1000;
client_wait_up_timeout = 1+etcd_report_interval+(st_cli.max_etcd_attempts*(2*st_cli.etcd_quick_timeout)+999)/1000;
}
// log_level
log_level = config["log_level"].uint64_value();