diff options
| author | Dan Engelbrecht <[email protected]> | 2025-11-21 14:16:38 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-11-21 14:16:38 +0100 |
| commit | e02a8a638b315f42736e6d345a33020c444c1c49 (patch) | |
| tree | e52fa8cfc2fa13172c42086dee2089ed2f37a82b | |
| parent | 5.7.12 (diff) | |
| download | zen-e02a8a638b315f42736e6d345a33020c444c1c49.tar.xz zen-e02a8a638b315f42736e6d345a33020c444c1c49.zip | |
increase timeout and add retry when testing host connectivity (#659)
4 files changed, 8 insertions, 8 deletions
diff --git a/src/zenremotestore/builds/buildstoragecache.cpp b/src/zenremotestore/builds/buildstoragecache.cpp index 39f2b8373..9f17e6b15 100644 --- a/src/zenremotestore/builds/buildstoragecache.cpp +++ b/src/zenremotestore/builds/buildstoragecache.cpp @@ -414,11 +414,11 @@ ZenCacheEndpointTestResult TestZenCacheEndpoint(std::string_view BaseUrl, const bool AssumeHttp2, const bool HttpVerbose) { HttpClientSettings TestClientSettings{.LogCategory = "httpcacheclient", - .ConnectTimeout = std::chrono::milliseconds{1000}, - .Timeout = std::chrono::milliseconds{2000}, + .ConnectTimeout = std::chrono::milliseconds{2000}, + .Timeout = std::chrono::milliseconds{3000}, .AssumeHttp2 = AssumeHttp2, .AllowResume = true, - .RetryCount = 0, + .RetryCount = 1, .Verbose = HttpVerbose}; HttpClient TestHttpClient(BaseUrl, TestClientSettings); HttpClient::Response TestResponse = TestHttpClient.Get("/status/builds"); diff --git a/src/zenremotestore/jupiter/jupiterhost.cpp b/src/zenremotestore/jupiter/jupiterhost.cpp index 6b13d69a5..7706f00c2 100644 --- a/src/zenremotestore/jupiter/jupiterhost.cpp +++ b/src/zenremotestore/jupiter/jupiterhost.cpp @@ -48,11 +48,11 @@ JupiterEndpointTestResult TestJupiterEndpoint(std::string_view BaseUrl, const bool AssumeHttp2, const bool HttpVerbose) { HttpClientSettings TestClientSettings{.LogCategory = "httpbuildsclient", - .ConnectTimeout = std::chrono::milliseconds{1000}, - .Timeout = std::chrono::milliseconds{2000}, + .ConnectTimeout = std::chrono::milliseconds{2000}, + .Timeout = std::chrono::milliseconds{3000}, .AssumeHttp2 = AssumeHttp2, .AllowResume = true, - .RetryCount = 0, + .RetryCount = 1, .Verbose = HttpVerbose}; HttpClient TestHttpClient(BaseUrl, TestClientSettings); diff --git a/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp index e27ab0c1f..bb3de738a 100644 --- a/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp +++ b/src/zenremotestore/projectstore/buildsremoteprojectstore.cpp @@ -672,7 +672,7 @@ CreateJupiterBuildsRemoteStore(LoggerRef InLog, } HttpClientSettings ClientSettings{.LogCategory = "httpbuildsclient", - .ConnectTimeout = std::chrono::milliseconds(2000), + .ConnectTimeout = std::chrono::milliseconds(3000), .Timeout = std::chrono::milliseconds(1800000), .AccessTokenProvider = std::move(TokenProvider), .AssumeHttp2 = ResolveRes.HostAssumeHttp2, diff --git a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp index ca7a5b391..1dd0a235c 100644 --- a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp @@ -366,7 +366,7 @@ CreateJupiterRemoteStore(LoggerRef InLog, } JupiterClientOptions ClientOptions{.Name = "Remote store"sv, .ServiceUrl = Url, - .ConnectTimeout = std::chrono::milliseconds(2000), + .ConnectTimeout = std::chrono::milliseconds(3000), .Timeout = std::chrono::milliseconds(1800000), .AssumeHttp2 = Options.AssumeHttp2, .AllowResume = true, |