Merge branch 'main' into users/prachisingla/AddMonitorIterationsInBas…

…eMonitor
microsoft · Aug 14, 2023 · a196786 · a196786
2 parents a5f33a4 + 850601e
commit a196786
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 56 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -69,4 +69,5 @@
 /src/VirtualClient/VirtualClient.Packaging/win-x64/SQLTPCC/HammerDB/**/* eol=lf
 /src/VirtualClient/VirtualClient.Actions/**/*.sh eol=lf
 /src/VirtualClient/VirtualClient.Dependencies/**/*.sh eol=lf
-yarn.lock eol=lf
+yarn.lock eol=lf
+/src/VirtualClient/VirtualClient.Actions/SuperBenchmark/local.ini eol=lf
diff --git a/.pipelines/azure-pipelines-linux.yml b/.pipelines/azure-pipelines-linux.yml
@@ -13,7 +13,7 @@ pool:
   vmImage: ubuntu-latest
 
 variables:
-  VcVersion : 1.8.5
+  VcVersion : 1.8.6
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/.pipelines/azure-pipelines.yml b/.pipelines/azure-pipelines.yml
@@ -18,7 +18,7 @@ pool:
   vmImage: windows-latest
 
 variables:
-  VcVersion : 1.8.5
+  VcVersion : 1.8.6
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/...ient/VirtualClient.Actions.FunctionalTests/SysbenchOLTP/SysbenchOLTPClientProfileTests.cs b/...ient/VirtualClient.Actions.FunctionalTests/SysbenchOLTP/SysbenchOLTPClientProfileTests.cs
@@ -59,9 +59,9 @@ public async Task SysbenchOLTPWorkloadProfileExecutesTheExpectedWorkloadsOnUnixP
 
             string scriptPath = this.mockFixture.PlatformSpecifics.GetScriptPath("sysbencholtp");
 
-            string balancedClientScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "balanced-Client.sh");
-            string balancedServerScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "balanced-Server.sh");
-            string inMemoryScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "in-Memory.sh");
+            string balancedClientScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "balanced-client.sh");
+            string balancedServerScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "balanced-server.sh");
+            string inMemoryScript = this.mockFixture.PlatformSpecifics.Combine(scriptPath, "in-memory.sh");
 
             this.mockFixture.SetupFile(balancedServerScript);
             this.mockFixture.SetupFile(balancedClientScript);
@@ -93,9 +93,9 @@ private IEnumerable<string> GetProfileExpectedCommands(PlatformID platform, Arch
             {
                 "git clone https://github.com/akopytov/sysbench.git /home/user/tools/VirtualClient/packages/sysbench",
 
-                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/balanced-Server.sh\"",
-                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/balanced-Client.sh\"",
-                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/in-Memory.sh\"",
+                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/balanced-server.sh\"",
+                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/balanced-client.sh\"",
+                $"sudo chmod +x \"/home/user/tools/VirtualClient/scripts/sysbencholtp/in-memory.sh\"",
 
                 "sudo ./autogen.sh",
                 "sudo ./configure",

diff --git a/...ualClient/VirtualClient.Actions.UnitTests/SysbenchOLTP/SysbenchOLTPClientExecutorTests.cs b/...ualClient/VirtualClient.Actions.UnitTests/SysbenchOLTP/SysbenchOLTPClientExecutorTests.cs
@@ -95,9 +95,9 @@ public async Task SysbenchOLTPClientExecutorRunsTheExpectedWorkloadCommand()
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Client.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/in-Memory.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-client.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/in-memory.sh\"",
                 "sudo ./autogen.sh",
                 "sudo ./configure",
                 "sudo make -j",
@@ -162,9 +162,9 @@ public async Task SysbenchOLTPClientExecutorUsesDefinedParameters()
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Client.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/in-Memory.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-client.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/in-memory.sh\"",
                 "sudo ./autogen.sh",
                 "sudo ./configure",
                 "sudo make -j",
@@ -238,16 +238,16 @@ public async Task SysbenchOLTPClientExecutorRunsTheExpectedWorkloadCommandBalanc
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Client.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/in-Memory.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-client.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/in-memory.sh\"",
                 "sudo ./autogen.sh",
                 "sudo ./configure",
                 "sudo make -j",
                 "sudo make install",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_read_write --threads=1 --tables=10 --table-size={records} --mysql-db=sbtest --mysql-host=1.2.3.5 --time=10 cleanup",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_common --tables=10 --table-size={records} --mysql-db=sbtest --mysql-host=1.2.3.5 prepare",
-                $"sudo {this.scriptPath}/balanced-Client.sh 1.2.3.5 10 sbtest /testdrive1 /testdrive2",
+                $"sudo {this.scriptPath}/balanced-client.sh 1.2.3.5 10 sbtest /testdrive1 /testdrive2",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_read_write --threads=1 --tables=10 --table-size={records} --mysql-db=sbtest --mysql-host=1.2.3.5 --time=10 run"
             };
 
@@ -296,9 +296,9 @@ public async Task SysbenchOLTPClientExecutorSkipsInitializationOfTheWorkloadForE
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Client.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/in-Memory.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-client.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/in-memory.sh\"",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_read_write --threads={this.threadCount} --tables=10 --table-size={this.recordCount} --mysql-db=sbtest --mysql-host=1.2.3.5 --time=10 cleanup",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_common --tables=10 --table-size={this.recordCount} --mysql-db=sbtest --mysql-host=1.2.3.5 prepare",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_read_write --threads={this.threadCount} --tables=10 --table-size={this.recordCount} --mysql-db=sbtest --mysql-host=1.2.3.5 --time=10 run"
@@ -362,9 +362,9 @@ public async Task SysbenchOLTPClientExecutorSkipsPrepareAndCleanupSteps()
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/balanced-Client.sh\"",
-                $"sudo chmod +x \"{this.scriptPath}/in-Memory.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/balanced-client.sh\"",
+                $"sudo chmod +x \"{this.scriptPath}/in-memory.sh\"",
                 $"sudo /home/user/tools/VirtualClient/packages/sysbench/src/sysbench oltp_read_write --threads={this.threadCount} --tables=10 --table-size={this.recordCount} --mysql-db=sbtest --mysql-host=1.2.3.5 --time=10 run",
             };
 

diff --git a/...ualClient/VirtualClient.Actions.UnitTests/SysbenchOLTP/SysbenchOLTPServerExecutorTests.cs b/...ualClient/VirtualClient.Actions.UnitTests/SysbenchOLTP/SysbenchOLTPServerExecutorTests.cs
@@ -67,10 +67,10 @@ public async Task SysbenchOLTPServerExecutorExcutesExpectedProcessInMemoryScenar
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{scriptPath}/in-Memory.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Client.sh\"",
-                $"sudo {scriptPath}/in-Memory.sh 8192"
+                $"sudo chmod +x \"{scriptPath}/in-memory.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-client.sh\"",
+                $"sudo {scriptPath}/in-memory.sh 8192"
             };
 
             this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
@@ -126,10 +126,10 @@ public async Task SysbenchOLTPServerExecutorExcutesExpectedProcessBalancedScenar
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{scriptPath}/in-Memory.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Client.sh\"",
-                $"sudo {scriptPath}/balanced-Server.sh {mountPaths}"
+                $"sudo chmod +x \"{scriptPath}/in-memory.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-client.sh\"",
+                $"sudo {scriptPath}/balanced-server.sh {mountPaths}"
             };
 
             this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
@@ -170,10 +170,10 @@ public async Task SysbenchOLTPServerExecutorDoesNotExecuteBalancedScenarioOnInit
 
             string[] expectedCommands =
             {
-                $"sudo chmod +x \"{scriptPath}/in-Memory.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Server.sh\"",
-                $"sudo chmod +x \"{scriptPath}/balanced-Client.sh\"",
-                $"sudo {scriptPath}/balanced-Server.sh"
+                $"sudo chmod +x \"{scriptPath}/in-memory.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-server.sh\"",
+                $"sudo chmod +x \"{scriptPath}/balanced-client.sh\"",
+                $"sudo {scriptPath}/balanced-server.sh"
             };
 
             this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>

diff --git a/src/VirtualClient/VirtualClient.Actions/SuperBenchmark/SuperBenchmarkExecutor.cs b/src/VirtualClient/VirtualClient.Actions/SuperBenchmark/SuperBenchmarkExecutor.cs
@@ -9,6 +9,7 @@ namespace VirtualClient.Actions
     using System.IO.Abstractions;
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis;
     using Microsoft.Extensions.DependencyInjection;
     using VirtualClient.Common;
     using VirtualClient.Common.Extensions;
@@ -159,7 +160,7 @@ protected override async Task InitializeAsync(EventContext telemetryContext, Can
                 string cloneDir = this.PlatformSpecifics.Combine(this.PlatformSpecifics.PackagesDirectory, "superbenchmark");
                 if (!this.fileSystem.Directory.Exists(cloneDir))
                 {
-                    await this.ExecuteCommandAsync("git", $"clone -b v{this.Version} https://github.com/microsoft/superbenchmark", this.PlatformSpecifics.PackagesDirectory, telemetryContext, cancellationToken, runElevated: true);
+                    await this.ExecuteSbCommandAsync("git", $"clone -b v{this.Version} https://github.com/microsoft/superbenchmark", this.PlatformSpecifics.PackagesDirectory, telemetryContext, cancellationToken, true);
                 }
 
                 foreach (string file in this.fileSystem.Directory.GetFiles(this.PlatformSpecifics.GetScriptPath("superbenchmark")))
@@ -170,15 +171,26 @@ protected override async Task InitializeAsync(EventContext telemetryContext, Can
                         true);
                 }
 
-                await this.ExecuteCommandAsync("bash", $"initialize.sh {this.Username}", this.SuperBenchmarkDirectory, telemetryContext, cancellationToken, runElevated: true);
-                await this.ExecuteCommandAsync("sb", $"deploy --host-list localhost -i {this.ContainerVersion}", this.SuperBenchmarkDirectory, telemetryContext, cancellationToken, runElevated: false);
+                await this.ExecuteSbCommandAsync("bash", $"initialize.sh {this.Username}", this.SuperBenchmarkDirectory, telemetryContext, cancellationToken, true);
+                await this.ExecuteSbCommandAsync("sb", $"deploy --host-list localhost -i {this.ContainerVersion}", this.SuperBenchmarkDirectory, telemetryContext, cancellationToken, false);
 
                 state.SuperBenchmarkInitialized = true;
             }
 
             await this.stateManager.SaveStateAsync<SuperBenchmarkState>($"{nameof(SuperBenchmarkState)}", state, cancellationToken);
         }
 
+        private async Task ExecuteSbCommandAsync(string command, string commandArguments, string workingDirectory, EventContext telemetryContext, CancellationToken cancellationToken, bool runElevated)
+        {
+            IProcessProxy process = await this.ExecuteCommandAsync(command, commandArguments, workingDirectory, telemetryContext, cancellationToken, runElevated: runElevated);
+
+            if (!cancellationToken.IsCancellationRequested)
+            {
+                await this.LogProcessDetailsAsync(process, telemetryContext, "Superbench", logToFile: true);
+                process.ThrowIfWorkloadFailed();
+            }
+        }
+
         private async Task CaptureMetricsAsync(IProcessProxy process, string commandArguments, EventContext telemetryContext, CancellationToken cancellationToken)
         {
             if (!cancellationToken.IsCancellationRequested)

diff --git a/src/VirtualClient/VirtualClient.Actions/SuperBenchmark/local.ini b/src/VirtualClient/VirtualClient.Actions/SuperBenchmark/local.ini
@@ -1,2 +1,2 @@
 [all] 
-localhost ansible_connection=local 
+localhost ansible_connection=local
diff --git a/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPClientExecutor.cs
@@ -384,7 +384,7 @@ private async Task PrepareBalancedScenarioAsync(string diskPaths, EventContext t
             // client work in the balanced scenario includes copying all tables from OS disk to data disk,
             // dropping old tables & renaming them
 
-            string balancedScript = "balanced-Client.sh";
+            string balancedScript = "balanced-client.sh";
             string scriptsDirectory = this.PlatformSpecifics.GetScriptPath("sysbencholtp");
             string balancedArguments = $"{this.ServerIpAddress} 10 {this.DatabaseName} {diskPaths}";
 

diff --git a/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPExecutor.cs b/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPExecutor.cs
@@ -146,17 +146,17 @@ protected async Task InitializeExecutablesAsync(CancellationToken cancellationTo
                 string scriptsDirectory = this.PlatformSpecifics.GetScriptPath("sysbencholtp");
 
                 await this.SystemManager.MakeFileExecutableAsync(
-                    this.Combine(scriptsDirectory, "balanced-Server.sh"),
+                    this.Combine(scriptsDirectory, "balanced-server.sh"),
                     this.Platform,
                     cancellationToken);
 
                 await this.SystemManager.MakeFileExecutableAsync(
-                    this.Combine(scriptsDirectory, "balanced-Client.sh"),
+                    this.Combine(scriptsDirectory, "balanced-client.sh"),
                     this.Platform,
                     cancellationToken);
 
                 await this.SystemManager.MakeFileExecutableAsync(
-                    this.Combine(scriptsDirectory, "in-Memory.sh"),
+                    this.Combine(scriptsDirectory, "in-memory.sh"),
                     this.Platform,
                     cancellationToken);
             }

diff --git a/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPServerExecutor.cs b/src/VirtualClient/VirtualClient.Actions/SysbenchOLTP/SysbenchOLTPServerExecutor.cs
@@ -133,7 +133,7 @@ private async Task PrepareInMemoryScenarioAsync(EventContext telemetryContext, C
             {
                 // server's job is to configure buffer size, in memory script updates the mysql config file
 
-                string inMemoryScript = "in-Memory.sh";
+                string inMemoryScript = "in-memory.sh";
                 string scriptsDirectory = this.PlatformSpecifics.GetScriptPath("sysbencholtp");
 
                 MemoryInfo memoryInfo = await this.SystemManager.GetMemoryInfoAsync(cancellationToken);
@@ -217,7 +217,7 @@ private async Task<string> PrepareBalancedScenarioAsync(EventContext telemetryCo
                     }
                 }
 
-                string balancedScript = "balanced-Server.sh";
+                string balancedScript = "balanced-server.sh";
                 string scriptsDirectory = this.PlatformSpecifics.GetScriptPath("sysbencholtp");
 
                 using (IProcessProxy process = await this.ExecuteCommandAsync(

diff --git a/...t.Actions/SysbenchOLTP/balanced-Client.sh → ...t.Actions/SysbenchOLTP/balanced-client.sh b/...t.Actions/SysbenchOLTP/balanced-Client.sh → ...t.Actions/SysbenchOLTP/balanced-client.sh
diff --git a/...t.Actions/SysbenchOLTP/balanced-Server.sh → ...t.Actions/SysbenchOLTP/balanced-server.sh b/...t.Actions/SysbenchOLTP/balanced-Server.sh → ...t.Actions/SysbenchOLTP/balanced-server.sh
diff --git a/...lClient.Actions/SysbenchOLTP/in-Memory.sh → ...lClient.Actions/SysbenchOLTP/in-memory.sh b/...lClient.Actions/SysbenchOLTP/in-Memory.sh → ...lClient.Actions/SysbenchOLTP/in-memory.sh
diff --git a/src/VirtualClient/VirtualClient.Actions/VirtualClient.Actions.csproj b/src/VirtualClient/VirtualClient.Actions/VirtualClient.Actions.csproj
@@ -31,13 +31,7 @@
         <ScriptFiles Include="PostgreSQL\*.sh" />
         <ScriptFiles Include="SuperBenchmark\*.yaml;SuperBenchmark\*.sh;SuperBenchmark\*.ini" />
         <ScriptFiles Include="MLPerf\**\*.py" />
-	<ScriptFiles Include="SysbenchOLTP\*.sh" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ScriptFiles Remove="SysbenchOLTP\balanced-Client.sh" />
-      <ScriptFiles Remove="SysbenchOLTP\balanced-Server.sh" />
-      <ScriptFiles Remove="SysbenchOLTP\in-Memory.sh" />
+	    <ScriptFiles Include="SysbenchOLTP\*.sh" />
     </ItemGroup>
 
     <Target Name="CopyWorkloadScriptsToOutput" AfterTargets="Build">

diff --git a/src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj b/src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj
@@ -58,13 +58,13 @@
         NuGet package in the /content/win-x64|win-arm64/profiles folder
         -->
         <WindowsProfiles Include="profiles\GET-STARTED-OPENSSL.json" />
-	<WindowsProfiles Include="profiles\DEPENDENCY-AMD-GPU-DRIVER.json" />
+	    <WindowsProfiles Include="profiles\DEPENDENCY-AMD-GPU-DRIVER.json" />
         <WindowsProfiles Include="profiles\BOOTSTRAP-DEPENDENCIES.json" />
         <WindowsProfiles Include="profiles\PERF-ASPNETBENCH.json" />
         <WindowsProfiles Include="profiles\PERF-COMPRESSION.json" />
         <WindowsProfiles Include="profiles\PERF-CPU-COREMARK.json" />
         <WindowsProfiles Include="profiles\PERF-CPU-COREMARKPRO.json" />
-	<WindowsProfiles Include="profiles\PERF-GPU-FURMARK.json" />
+	    <WindowsProfiles Include="profiles\PERF-GPU-FURMARK.json" />
         <WindowsProfiles Include="profiles\PERF-CPU-GEEKBENCH.json" />
         <WindowsProfiles Include="profiles\PERF-CPU-LAPACK.json" />
         <WindowsProfiles Include="profiles\PERF-CPU-OPENSSL.json" />