Users/nmalkapuram/memtiercpubound (#302)

nmalkapuram · yangpanMS · web-flow · commit 905c6b889ec1 · 2024-04-29T11:46:28.000-07:00
* bind memtier process to cpu cores

* update unit tests

* naming changes

* naming changes

---------

Co-authored-by: Yang Pan &lt;31965446+yangpanMS@users.noreply.github.com&gt;
diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Memtier/MemtierBenchmarkClientExecutorTests.cs
@@ -116,7 +116,8 @@ public async Task MemtierBenchmarkClientExecutorExecutesExpectedCommands()
                     $"sudo chmod +x \"{this.mockPackage.Path}/memtier_benchmark\"",
 
                     // Run the Memtier benchmark. Values based on the default parameter values set at the top
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}"
+                    // $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}",
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\""
                 };
 
                 this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
@@ -145,7 +146,7 @@ public async Task MemtierBenchmarkClientExecutorExecutesExpectedCommandsWhenAUse
                     $"sudo chmod +x \"{this.mockPackage.Path}/memtier_benchmark\"",
 
                     // Run the Memtier benchmark. Values based on the default parameter values set at the top
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}"
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\""
                 };
 
                 this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
@@ -175,10 +176,10 @@ public async Task MemtierBenchmarkClientExecutorExecutesExpectedCommands2ClientI
                     $"sudo chmod +x \"{this.mockPackage.Path}/memtier_benchmark\"",
 
                     // Client instance #1
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}",
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\"",
 
                      // Client instance #2
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}"
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\""
                 };
 
                 this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
@@ -208,16 +209,16 @@ public async Task MemtierBenchmarkClientExecutorExecutesExpectedCommands4ClientI
                     $"sudo chmod +x \"{this.mockPackage.Path}/memtier_benchmark\"",
 
                     // Client instance #1
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}",
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\"",
 
                      // Client instance #2
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}",
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\"",
 
                     // Client instance #3
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}",
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\"",
 
                      // Client instance #4
-                    $"sudo {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}"
+                    $"sudo bash -c \"numactl -C 1 {this.mockPackage.Path}/memtier_benchmark --server 1.2.3.5 --port 6379 {executor.CommandLine}\""
                 };
 
                 this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDirectory) =>
diff --git a/src/VirtualClient/VirtualClient.Actions/Memtier/MemtierBenchmarkClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Memtier/MemtierBenchmarkClientExecutor.cs
@@ -427,39 +427,46 @@ private Task ExecuteWorkloadsAsync(IPAddress serverIPAddress, ServerState server
             {
                 using (BackgroundOperations profiling = BackgroundOperations.BeginProfiling(this, cancellationToken))
                 {
+                    string precommand = "bash";
                     string command = this.MemtierExecutablePath;
                     string workingDirectory = this.MemtierPackagePath;
                     string commandArguments = string.Empty;
                     List<string> commands = new List<string>();
 
-                    relatedContext.AddContext("command", command);
+                    relatedContext.AddContext("command", precommand);
                     relatedContext.AddContext("commandArguments", commands);
                     relatedContext.AddContext("workingDirectory", workingDirectory);
 
                     List<Task> workloadProcesses = new List<Task>();
                     DateTime startTime = DateTime.UtcNow;
+                    int serverprocesscount = serverState.Ports.Count();
+                    CpuInfo cpuInfo = this.SystemManagement.GetCpuInfoAsync(CancellationToken.None).GetAwaiter().GetResult();
+                    int logicalProcessorCount = cpuInfo.LogicalProcessorCount;
 
                     for (int i = 0; i < serverState.Ports.Count(); i++)
                     {
                         PortDescription portDescription = serverState.Ports.ElementAt(i);
                         int serverPort = portDescription.Port;
 
+                        int memtiercpuaffinity = (serverprocesscount + i) % logicalProcessorCount;
                         for (int instances = 0; instances < this.ClientInstances; instances++)
                         {
                             // memtier_benchmark Documentation:
                             // https://github.com/RedisLabs/memtier_benchmark
 
+                            commandArguments = $"-c \"numactl -C {memtiercpuaffinity} {command} --server {serverIPAddress} --port {serverPort}";
+
                             if (this.IsTLSEnabled)
                             {
-                                commandArguments = $"--server {serverIPAddress} --port {serverPort} --tls --cert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.crt")}  --key {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.key")} --cacert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "ca.crt")} {this.CommandLine}";
+                                commandArguments += $" --tls --cert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.crt")}  --key {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.key")} --cacert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "ca.crt")} {this.CommandLine}\"";
                             }
                             else
                             {
-                                commandArguments = $"--server {serverIPAddress} --port {serverPort} {this.CommandLine}";
+                                commandArguments += $" {this.CommandLine}\"";
                             }
 
                             commands.Add(commandArguments);
-                            workloadProcesses.Add(this.ExecuteWorkloadAsync(portDescription, command, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));
+                            workloadProcesses.Add(this.ExecuteWorkloadAsync(portDescription, precommand, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));
 
                             if (this.WarmUp)
                             {

Original file line number	Diff line number	Diff line change
`@@ -427,39 +427,46 @@ private Task ExecuteWorkloadsAsync(IPAddress serverIPAddress, ServerState server`
`427`	`427`	`{`
`428`	`428`	`using (BackgroundOperations profiling = BackgroundOperations.BeginProfiling(this, cancellationToken))`
`429`	`429`	`{`
	`430`	`+ string precommand = "bash";`
`430`	`431`	`string command = this.MemtierExecutablePath;`
`431`	`432`	`string workingDirectory = this.MemtierPackagePath;`
`432`	`433`	`string commandArguments = string.Empty;`
`433`	`434`	`List<string> commands = new List<string>();`
`434`	`435`
`435`		`- relatedContext.AddContext("command", command);`
	`436`	`+ relatedContext.AddContext("command", precommand);`
`436`	`437`	`relatedContext.AddContext("commandArguments", commands);`
`437`	`438`	`relatedContext.AddContext("workingDirectory", workingDirectory);`
`438`	`439`
`439`	`440`	`List<Task> workloadProcesses = new List<Task>();`
`440`	`441`	`DateTime startTime = DateTime.UtcNow;`
	`442`	`+ int serverprocesscount = serverState.Ports.Count();`
	`443`	`+ CpuInfo cpuInfo = this.SystemManagement.GetCpuInfoAsync(CancellationToken.None).GetAwaiter().GetResult();`
	`444`	`+ int logicalProcessorCount = cpuInfo.LogicalProcessorCount;`
`441`	`445`
`442`	`446`	`for (int i = 0; i < serverState.Ports.Count(); i++)`
`443`	`447`	`{`
`444`	`448`	`PortDescription portDescription = serverState.Ports.ElementAt(i);`
`445`	`449`	`int serverPort = portDescription.Port;`
`446`	`450`
	`451`	`+ int memtiercpuaffinity = (serverprocesscount + i) % logicalProcessorCount;`
`447`	`452`	`for (int instances = 0; instances < this.ClientInstances; instances++)`
`448`	`453`	`{`
`449`	`454`	`// memtier_benchmark Documentation:`
`450`	`455`	`// https://github.com/RedisLabs/memtier_benchmark`
`451`	`456`
	`457`	`+ commandArguments = $"-c \"numactl -C {memtiercpuaffinity} {command} --server {serverIPAddress} --port {serverPort}";`
	`458`	`+`
`452`	`459`	`if (this.IsTLSEnabled)`
`453`	`460`	`{`
`454`		`- commandArguments = $"--server {serverIPAddress} --port {serverPort} --tls --cert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.crt")} --key {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.key")} --cacert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "ca.crt")} {this.CommandLine}";`
	`461`	`+ commandArguments += $" --tls --cert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.crt")} --key {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "redis.key")} --cacert {this.PlatformSpecifics.Combine(this.RedisResourcesPath, "ca.crt")} {this.CommandLine}\"";`
`455`	`462`	`}`
`456`	`463`	`else`
`457`	`464`	`{`
`458`		`- commandArguments = $"--server {serverIPAddress} --port {serverPort} {this.CommandLine}";`
	`465`	`+ commandArguments += $" {this.CommandLine}\"";`
`459`	`466`	`}`
`460`	`467`
`461`	`468`	`commands.Add(commandArguments);`
`462`		`- workloadProcesses.Add(this.ExecuteWorkloadAsync(portDescription, command, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));`
	`469`	`+ workloadProcesses.Add(this.ExecuteWorkloadAsync(portDescription, precommand, commandArguments, workingDirectory, relatedContext.Clone(), cancellationToken));`
`463`	`470`
`464`	`471`	`if (this.WarmUp)`
`465`	`472`	`{`