status-im
/
cs-codex-dist-tests
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better http timeout and retrying values

This commit is contained in:
benbierens 2023-07-17 15:21:10 +02:00
parent 1154544e99
commit fe25166478
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
5 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DistTestCore/Codex/CodexAccess.cs
View File

@ -22,17 +22,12 @@ namespace DistTestCore.Codex
public CodexDebugResponse GetDebugInfo()
{
return Http(TimeSpan.FromSeconds(60)).HttpGetJson<CodexDebugResponse>("debug/info");
return Http().HttpGetJson<CodexDebugResponse>("debug/info");
}
public CodexDebugPeerResponse GetDebugPeer(string peerId)
{
return GetDebugPeer(peerId, TimeSpan.FromSeconds(10));
}
public CodexDebugPeerResponse GetDebugPeer(string peerId, TimeSpan timeout)
{
var http = Http(timeout);
var http = Http();
var str = http.HttpGetString($"debug/peer/{peerId}");
if (str.ToLowerInvariant() == "unable to find peer!")
@ -88,9 +83,9 @@ namespace DistTestCore.Codex
return Http().HttpGetString($"connect/{peerId}?addrs={peerMultiAddress}");
}
private Http Http(TimeSpan? timeoutOverride = null)
private Http Http()
{
return new Http(log, timeSet, Address, baseUrl: "/api/codex/v1", Container.Name, timeoutOverride);
return new Http(log, timeSet, Address, baseUrl: "/api/codex/v1", Container.Name);
}
}
}

3
DistTestCore/Helpers/PeerConnectionTestHelpers.cs
View File

@ -167,7 +167,6 @@ namespace DistTestCore.Helpers
public class Pair
{
private readonly TimeSpan timeout = TimeSpan.FromSeconds(60);
private TimeSpan aToBTime = TimeSpan.FromSeconds(0);
private TimeSpan bToATime = TimeSpan.FromSeconds(0);
@ -235,7 +234,7 @@ namespace DistTestCore.Helpers
try
{
var response = a.Node.GetDebugPeer(peerId, timeout);
var response = a.Node.GetDebugPeer(peerId);
if (!response.IsPeerFound)
{
return PeerConnectionState.NoConnection;

19
DistTestCore/Http.cs
View File

@ -13,16 +13,14 @@ namespace DistTestCore
private readonly Address address;
private readonly string baseUrl;
private readonly string? logAlias;
private readonly TimeSpan? timeoutOverride;
public Http(BaseLog log, ITimeSet timeSet, Address address, string baseUrl, string? logAlias = null, TimeSpan? timeoutOverride = null)
public Http(BaseLog log, ITimeSet timeSet, Address address, string baseUrl, string? logAlias = null)
{
this.log = log;
this.timeSet = timeSet;
this.address = address;
this.baseUrl = baseUrl;
this.logAlias = logAlias;
this.timeoutOverride = timeoutOverride;
if (!this.baseUrl.StartsWith("/")) this.baseUrl = "/" + this.baseUrl;
if (!this.baseUrl.EndsWith("/")) this.baseUrl += "/";
}
@ -127,24 +125,13 @@ namespace DistTestCore
private T Retry<T>(Func<T> operation, string description)
{
return Time.Retry(operation, GetTimeout(), timeSet.HttpCallRetryDelay(), description);
return Time.Retry(operation, timeSet.HttpCallRetryTime(), timeSet.HttpCallRetryDelay(), description);
}
private HttpClient GetClient()
{
return GetClient(GetTimeout());
}
private TimeSpan GetTimeout()
{
if (timeoutOverride.HasValue) return timeoutOverride.Value;
return timeSet.HttpCallTimeout();
}
private HttpClient GetClient(TimeSpan timeout)
{
var client = new HttpClient();
client.Timeout = timeout;
client.Timeout = timeSet.HttpCallTimeout();
return client;
}
}

6
DistTestCore/OnlineCodexNode.cs
View File

@ -12,7 +12,6 @@ namespace DistTestCore
string GetName();
CodexDebugResponse GetDebugInfo();
CodexDebugPeerResponse GetDebugPeer(string peerId);
CodexDebugPeerResponse GetDebugPeer(string peerId, TimeSpan timeout);
ContentId UploadFile(TestFile file);
TestFile? DownloadContent(ContentId contentId, string fileLabel = "");
void ConnectToPeer(IOnlineCodexNode node);
@ -60,11 +59,6 @@ namespace DistTestCore
return CodexAccess.GetDebugPeer(peerId);
}
public CodexDebugPeerResponse GetDebugPeer(string peerId, TimeSpan timeout)
{
return CodexAccess.GetDebugPeer(peerId, timeout);
}
public ContentId UploadFile(TestFile file)
{
using var fileStream = File.OpenRead(file.Filename);

6
DistTestCore/Timing.cs
View File

@ -10,7 +10,7 @@ namespace DistTestCore
public interface ITimeSet
{
TimeSpan HttpCallTimeout();
TimeSpan HttpCallRetryTimeout();
TimeSpan HttpCallRetryTime();
TimeSpan HttpCallRetryDelay();
TimeSpan WaitForK8sServiceDelay();
TimeSpan K8sOperationTimeout();
@ -24,7 +24,7 @@ namespace DistTestCore
return TimeSpan.FromSeconds(10);
}
public TimeSpan HttpCallRetryTimeout()
public TimeSpan HttpCallRetryTime()
{
return TimeSpan.FromMinutes(1);
}
@ -57,7 +57,7 @@ namespace DistTestCore
return TimeSpan.FromHours(2);
}
public TimeSpan HttpCallRetryTimeout()
public TimeSpan HttpCallRetryTime()
{
return TimeSpan.FromHours(5);
}