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

successful peer discovery tests

This commit is contained in:
benbierens 2023-05-11 12:44:53 +02:00
parent e9679e18c0
commit 38d5b172f4
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
7 changed files with 97 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DistTestCore/Codex/CodexAccess.cs
View File

@ -19,7 +19,12 @@ namespace DistTestCore.Codex
public CodexDebugResponse GetDebugInfo()
{
return Http().HttpGetJson<CodexDebugResponse>("debug/info");
return Http(TimeSpan.FromSeconds(2)).HttpGetJson<CodexDebugResponse>("debug/info");
}
public CodexDebugPeerResponse GetDebugPeer(string peerId)
{
return Http().HttpGetJson<CodexDebugPeerResponse>($"debug/peer/{peerId}");
}
public string UploadFile(FileStream fileStream)
@ -42,6 +47,11 @@ namespace DistTestCore.Codex
return Http().HttpPostJson($"storage/request/{contentId}", request);
}
public string ConnectToPeer(string peerId, string peerMultiAddress)
{
return Http().HttpGetString($"connect/{peerId}?addrs={peerMultiAddress}");
}
public void EnsureOnline()
{
try
@ -60,16 +70,11 @@ namespace DistTestCore.Codex
}
}
private Http Http()
private Http Http(TimeSpan? timeoutOverride = null)
{
var ip = Container.Pod.Cluster.IP;
var port = Container.ServicePorts[0].Number;
return new Http(log, timeSet, ip, port, baseUrl: "/api/codex/v1");
}
public string ConnectToPeer(string peerId, string peerMultiAddress)
{
return Http().HttpGetString($"connect/{peerId}?addrs={peerMultiAddress}");
return new Http(log, timeSet, ip, port, baseUrl: "/api/codex/v1", timeoutOverride);
}
}
@ -124,6 +129,18 @@ namespace DistTestCore.Codex
public string revision { get; set; } = string.Empty;
}
public class CodexDebugPeerResponse
{
public string peerId { get; set; } = string.Empty;
public long seqNo { get; set; }
public CodexDebugPeerAddressResponse[] addresses { get; set; } = Array.Empty<CodexDebugPeerAddressResponse>();
}
public class CodexDebugPeerAddressResponse
{
public string address { get; set; } = string.Empty;
}
public class CodexSalesAvailabilityRequest
{
public string size { get; set; } = string.Empty;

3
DistTestCore/CodexStarter.cs
View File

@ -1,6 +1,7 @@
using DistTestCore.Codex;
using DistTestCore.Marketplace;
using KubernetesWorkflow;
using Logging;
namespace DistTestCore
{
@ -74,7 +75,7 @@ namespace DistTestCore
{
var group = new CodexNodeGroup(lifecycle, codexSetup, runningContainers, codexNodeFactory);
RunningGroups.Add(group);
group.EnsureOnline();
Stopwatch.Measure(lifecycle.Log, "EnsureOnline", group.EnsureOnline, debug: true);
return group;
}

16
DistTestCore/Http.cs
View File

@ -14,15 +14,16 @@ namespace DistTestCore
private readonly string ip;
private readonly int port;
private readonly string baseUrl;
private readonly TimeSpan? timeoutOverride;
public Http(BaseLog log, ITimeSet timeSet, string ip, int port, string baseUrl)
public Http(BaseLog log, ITimeSet timeSet, string ip, int port, string baseUrl, TimeSpan? timeoutOverride = null)
{
this.log = log;
this.timeSet = timeSet;
this.ip = ip;
this.port = port;
this.baseUrl = baseUrl;
this.timeoutOverride = timeoutOverride;
if (!this.baseUrl.StartsWith("/")) this.baseUrl = "/" + this.baseUrl;
if (!this.baseUrl.EndsWith("/")) this.baseUrl += "/";
}
@ -125,9 +126,18 @@ namespace DistTestCore
}
private HttpClient GetClient()
{
if (timeoutOverride.HasValue)
{
return GetClient(timeoutOverride.Value);
}
return GetClient(timeSet.HttpCallTimeout());
}
private HttpClient GetClient(TimeSpan timeout)
{
var client = new HttpClient();
client.Timeout = timeSet.HttpCallTimeout();
client.Timeout = timeout;
return client;
}
}

6
DistTestCore/OnlineCodexNode.cs
View File

@ -10,6 +10,7 @@ namespace DistTestCore
{
string GetName();
CodexDebugResponse GetDebugInfo();
CodexDebugPeerResponse GetDebugPeer(string peerId);
ContentId UploadFile(TestFile file);
TestFile? DownloadContent(ContentId contentId);
void ConnectToPeer(IOnlineCodexNode node);
@ -51,6 +52,11 @@ namespace DistTestCore
return debugInfo;
}
public CodexDebugPeerResponse GetDebugPeer(string peerId)
{
return CodexAccess.GetDebugPeer(peerId);
}
public ContentId UploadFile(TestFile file)
{
Log($"Uploading file of size {file.GetFileSize()}...");

2
DistTestCore/Timing.cs
View File

@ -26,7 +26,7 @@ namespace DistTestCore
public TimeSpan HttpCallRetryTimeout()
{
return TimeSpan.FromSeconds(10);
return TimeSpan.FromMinutes(1);
}
public TimeSpan HttpCallRetryDelay()

1
Tests/PeerDiscoveryTests/LayeredDiscoveryTests.cs
View File

@ -32,6 +32,7 @@ namespace Tests.PeerDiscoveryTests
[TestCase(3)]
[TestCase(5)]
[TestCase(10)]
[TestCase(20)]
public void NodeChainTest(int chainLength)
{
var node = SetupCodexNode();

81
Tests/PeerDiscoveryTests/PeerTestHelpers.cs
View File

@ -17,14 +17,14 @@ namespace Tests.PeerDiscoveryTests
{
Time.Retry(() =>
{
var infos = nodes.Select(n => FetchDebugInfo(n, log)).ToArray();
var entries = nodes.Select(n => new Entry(n)).ToArray();
var failureMessags = new List<string>();
for (var x = 0; x < infos.Length; x++)
for (var x = 0; x < entries.Length; x++)
{
for (var y = x + 1; y < infos.Length; y++)
for (var y = x + 1; y < entries.Length; y++)
{
AssertKnowEachother(failureMessags, infos[x], infos[y], log);
AssertKnowEachother(failureMessags, entries[x], entries[y], log);
}
}
@ -32,44 +32,63 @@ namespace Tests.PeerDiscoveryTests
});
}
private static CodexDebugResponse FetchDebugInfo(IOnlineCodexNode n, BaseLog? log)
{
var info = n.GetDebugInfo();
if (log != null)
{
log.AddStringReplace(info.table.localNode.nodeId, $"-<{n.GetName()}>-");
}
return info;
}
private static void AssertKnowEachother(List<string> failureMessags, CodexDebugResponse a, CodexDebugResponse b, BaseLog? log)
private static void AssertKnowEachother(List<string> failureMessags, Entry a, Entry b, BaseLog? log)
{
AssertKnows(failureMessags, a, b, log);
AssertKnows(failureMessags, b, a, log);
}
private static void AssertKnows(List<string> failureMessags, CodexDebugResponse a, CodexDebugResponse b, BaseLog? log)
private static void AssertKnows(List<string> failureMessags, Entry a, Entry b, BaseLog? log)
{
//var enginePeers = string.Join(",", a.enginePeers.Select(p => p.peerId));
//var switchPeers = string.Join(",", a.switchPeers.Select(p => p.peerId));
var tableNodes = string.Join(",", a.table.nodes.Select(n => n.nodeId));
var peerId = b.Response.id;
var success = a.table.nodes.Any(n => n.nodeId == b.table.localNode.nodeId);
if (log != null)
try
{
var msg = success ? "PASS" : "FAIL";
log.Log($"{msg} {a.table.localNode.nodeId} is looking for {b.table.localNode.nodeId} in table-nodes [{tableNodes}]");
var response = a.Node.GetDebugPeer(peerId);
if (string.IsNullOrEmpty(response.peerId) || !response.addresses.Any())
{
failureMessags.Add($"{a.Response.id} did not know peer {peerId}");
}
else if (log != null)
{
log.Log($"{a.Response.id} knows {peerId}.");
}
}
catch (Exception e)
{
failureMessags.Add($"{a.Response.id} was unable to get 'debug/peer/{peerId}'. {e}");
}
//Assert.That(a.enginePeers.Any(p => p.peerId == b.id), $"{a.id} was looking for '{b.id}' in engine-peers [{enginePeers}] but it was not found.");
//Assert.That(a.switchPeers.Any(p => p.peerId == b.id), $"{a.id} was looking for '{b.id}' in switch-peers [{switchPeers}] but it was not found.");
if (!success)
{
failureMessags.Add($"{a.table.localNode.nodeId} was looking for '{b.table.localNode.nodeId}' in table-nodes [{tableNodes}] but it was not found.");
////var enginePeers = string.Join(",", a.enginePeers.Select(p => p.peerId));
////var switchPeers = string.Join(",", a.switchPeers.Select(p => p.peerId));
//var tableNodes = string.Join(",", a.table.nodes.Select(n => n.nodeId));
//var success = a.table.nodes.Any(n => n.nodeId == b.table.localNode.nodeId);
//if (log != null)
//{
// var msg = success ? "PASS" : "FAIL";
// log.Log($"{msg} {a.table.localNode.nodeId} is looking for {b.table.localNode.nodeId} in table-nodes [{tableNodes}]");
//}
////Assert.That(a.enginePeers.Any(p => p.peerId == b.id), $"{a.id} was looking for '{b.id}' in engine-peers [{enginePeers}] but it was not found.");
////Assert.That(a.switchPeers.Any(p => p.peerId == b.id), $"{a.id} was looking for '{b.id}' in switch-peers [{switchPeers}] but it was not found.");
//if (!success)
//{
// failureMessags.Add($"{a.table.localNode.nodeId} was looking for '{b.table.localNode.nodeId}' in table-nodes [{tableNodes}] but it was not found.");
//}
}
public class Entry
{
public Entry(IOnlineCodexNode node)
{
Node = node;
Response = node.GetDebugInfo();
}
public IOnlineCodexNode Node { get ; }
public CodexDebugResponse Response { get; }
}
}
}