From 7ec99347515d532034efacdf58d2381fda5d16ff Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 22 Apr 2024 11:17:47 +0200 Subject: [PATCH] Update to multipeer download test --- .../MultiPeerDownloadTests.cs | 68 +++++++++++++++---- Tests/DistTestCore/DistTest.cs | 19 ++++-- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs b/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs index 3c4e482..f4c0a5f 100644 --- a/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs +++ b/Tests/CodexTests/ScalabilityTests/MultiPeerDownloadTests.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using DistTestCore; +using NUnit.Framework; using Utils; namespace CodexTests.ScalabilityTests @@ -7,6 +8,8 @@ namespace CodexTests.ScalabilityTests public class MultiPeerDownloadTests : AutoBootstrapDistTest { [Test] + [DontDownloadLogs] + [UseLongTimeouts] [Combinatorial] public void MultiPeerDownload( [Values(5, 10, 20)] int numberOfHosts, @@ -16,8 +19,10 @@ namespace CodexTests.ScalabilityTests var hosts = AddCodex(numberOfHosts, s => s.WithLogLevel(CodexPlugin.CodexLogLevel.Trace)); var file = GenerateTestFile(fileSize.MB()); var cid = hosts[0].UploadFile(file); + var tailOfManifestCid = cid.Id.Substring(cid.Id.Length - 6); var uploadLog = Ci.DownloadLog(hosts[0]); + var expectedNumberOfBlocks = RoundUp(fileSize.MB().SizeInBytes, 64.KB().SizeInBytes) + 1; // +1 for manifest block. var blockCids = uploadLog .FindLinesThatContain("Putting block into network store") .Select(s => @@ -29,7 +34,8 @@ namespace CodexTests.ScalabilityTests }) .ToArray(); - // Each host has the file. + Assert.That(blockCids.Length, Is.EqualTo(expectedNumberOfBlocks)); + foreach (var h in hosts) h.DownloadContent(cid); var client = AddCodex(s => s.WithLogLevel(CodexPlugin.CodexLogLevel.Trace)); @@ -37,9 +43,8 @@ namespace CodexTests.ScalabilityTests resultFile!.AssertIsEqual(file); var downloadLog = Ci.DownloadLog(client); - var blocksPerHost = new Dictionary(); - var seenBlocks = new List(); var host = string.Empty; + var blockCidHostMap = new Dictionary(); downloadLog.IterateLines(line => { if (line.Contains("peer=") && line.Contains(" len=")) @@ -56,21 +61,60 @@ namespace CodexTests.ScalabilityTests var len = end - start; var blockCid = line.Substring(start, len); - if (!seenBlocks.Contains(blockCid)) - { - seenBlocks.Add(blockCid); - if (!blocksPerHost.ContainsKey(host)) blocksPerHost.Add(host, 1); - else blocksPerHost[host]++; - } + blockCidHostMap.Add(blockCid, host); + host = string.Empty; } }); - Log("Total number of blocks in dataset: " + blockCids.Length); + var totalFetched = blockCidHostMap.Count(p => !string.IsNullOrEmpty(p.Value)); + //PrintFullMap(blockCidHostMap); + PrintOverview(blockCidHostMap); + + Log("Expected number of blocks: " + expectedNumberOfBlocks); + Log("Total number of block CIDs found in dataset + manifest block: " + blockCids.Length); + Log("Total blocks fetched by hosts: " + totalFetched); + Assert.That(totalFetched, Is.EqualTo(expectedNumberOfBlocks)); + } + + private void PrintOverview(Dictionary blockCidHostMap) + { + var overview = new Dictionary(); + foreach (var pair in blockCidHostMap) + { + if (!overview.ContainsKey(pair.Value)) overview.Add(pair.Value, 1); + else overview[pair.Value]++; + } + Log("Blocks fetched per host:"); - foreach (var pair in blocksPerHost) + foreach (var pair in overview) { Log($"Host: {pair.Key} = {pair.Value}"); } } + + private void PrintFullMap(Dictionary blockCidHostMap) + { + Log("Per block, host it was fetched from:"); + foreach (var pair in blockCidHostMap) + { + if (string.IsNullOrEmpty(pair.Value)) + { + Log($"block: {pair.Key} = Not seen"); + } + else + { + Log($"block: {pair.Key} = '{pair.Value}'"); + } + } + } + + private long RoundUp(long filesize, long blockSize) + { + double f = filesize; + double b = blockSize; + + var result = Math.Ceiling(f / b); + return Convert.ToInt64(result); + } } } diff --git a/Tests/DistTestCore/DistTest.cs b/Tests/DistTestCore/DistTest.cs index b6c0ba9..ed99fe9 100644 --- a/Tests/DistTestCore/DistTest.cs +++ b/Tests/DistTestCore/DistTest.cs @@ -236,9 +236,19 @@ namespace DistTestCore } private bool ShouldUseLongTimeouts() + { + return CurrentTestMethodHasAttribute(); + } + + private bool HasDontDownloadAttribute() + { + return CurrentTestMethodHasAttribute(); + } + + private bool CurrentTestMethodHasAttribute() where T : PropertyAttribute { // Don't be fooled! TestContext.CurrentTest.Test allows you easy access to the attributes of the current test. - // But this doesn't work for tests making use of [TestCase]. So instead, we use reflection here to figure out + // But this doesn't work for tests making use of [TestCase] or [Combinatorial]. So instead, we use reflection here to figure out // if the attribute is present. var currentTest = TestContext.CurrentContext.Test; var className = currentTest.ClassName; @@ -247,7 +257,7 @@ namespace DistTestCore var testClasses = testAssemblies.SelectMany(a => a.GetTypes()).Where(c => c.FullName == className).ToArray(); var testMethods = testClasses.SelectMany(c => c.GetMethods()).Where(m => m.Name == methodName).ToArray(); - return testMethods.Any(m => m.GetCustomAttribute() != null); + return testMethods.Any(m => m.GetCustomAttribute() != null); } private void IncludeLogsOnTestFailure(TestLifecycle lifecycle) @@ -267,8 +277,8 @@ namespace DistTestCore private bool ShouldDownloadAllLogs(TestStatus testStatus) { - if (!IsDownloadingLogsEnabled()) return false; if (configuration.AlwaysDownloadContainerLogs) return true; + if (!IsDownloadingLogsEnabled()) return false; if (testStatus == TestStatus.Failed) { return true; @@ -289,8 +299,7 @@ namespace DistTestCore private bool IsDownloadingLogsEnabled() { - var testProperties = TestContext.CurrentContext.Test.Properties; - return !testProperties.ContainsKey(DontDownloadLogsAttribute.DontDownloadKey); + return !HasDontDownloadAttribute(); } }