optimizing code

microsoft · Dec 2, 2024 · 03f1b17 · 03f1b17
1 parent a722b95
commit 03f1b17
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 76 deletions.
diff --git a/src/VirtualClient/VirtualClient.Actions/CtsTraffic/CtsTrafficClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/CtsTraffic/CtsTrafficClientExecutor.cs
@@ -8,6 +8,7 @@ namespace VirtualClient.Actions
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
+    using MathNet.Numerics;
     using Microsoft.Extensions.DependencyInjection;
     using VirtualClient;
     using VirtualClient.Common;
@@ -98,7 +99,8 @@ await this.ServerApiClient.PollForExpectedStateAsync<CtsTrafficServerState>(
                 cancellationToken,
                 this.PollingInterval);
 
-            string targetIPAddress = this.GetServerIPAddress(cancellationToken);
+            ClientInstance instance = this.Layout.GetClientInstance(this.AgentId);
+            string targetIPAddress = (instance.Role == ClientRole.Server) ? "localhost" : this.GetServerIpAddress();
 
             string ctsTrafficCommandArgs = $"-Target:{targetIPAddress} -Consoleverbosity:1 -StatusFilename:{this.StatusFileName} " +
             $@"-ConnectionFilename:{this.ConnectionsFileName} -ErrorFileName:{this.ErrorFileName} -Port:{this.Port} " +
@@ -145,18 +147,5 @@ await this.ServerApiClient.PollForExpectedStateAsync<CtsTrafficServerState>(
             }
 
         }
-
-        private string GetServerIPAddress(CancellationToken cancellationToken)
-        {
-            string targetIPAddress = "localhost";
-
-            if (this.IsMultiRoleLayout())
-            {
-                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
-                targetIPAddress = serverInstance.IPAddress;
-            }
-
-            return targetIPAddress;
-        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchClientExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchClientExecutor.cs
@@ -218,7 +218,7 @@ private async Task RunOLTPWorkloadAsync(EventContext telemetryContext, Cancellat
             string script = $"{this.SysbenchPackagePath}/run-workload.py ";
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
-                PythonCommand,
+                SysbenchClientExecutor.PythonCommand,
                 script + this.sysbenchExecutionArguments,
                 this.SysbenchPackagePath,
                 telemetryContext,
@@ -246,7 +246,7 @@ private async Task RunTPCCWorkloadAsync(EventContext telemetryContext, Cancellat
             string script = $"{this.SysbenchPackagePath}/run-workload.py ";
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
-                PythonCommand,
+                SysbenchClientExecutor.PythonCommand,
                 script + this.sysbenchExecutionArguments,
                 this.SysbenchPackagePath,
                 telemetryContext,
@@ -274,7 +274,7 @@ private async Task TruncateMySQLDatabaseAsync(EventContext telemetryContext, Can
             }
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
-                PythonCommand,
+                SysbenchClientExecutor.PythonCommand,
                 arguments,
                 Environment.CurrentDirectory,
                 telemetryContext,
@@ -303,11 +303,10 @@ private async Task PrepareOLTPMySQLDatabase(EventContext telemetryContext, Cance
                 this.sysbenchPrepareArguments += $" --host \"{serverIp}\"";
             }
 
-            string command = $"python3";
             string arguments = $"{this.SysbenchPackagePath}/populate-database.py ";
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
-                command,
+                SysbenchClientExecutor.PythonCommand,
                 arguments + this.sysbenchPrepareArguments,
                 this.SysbenchPackagePath,
                 telemetryContext,
@@ -320,19 +319,5 @@ private async Task PrepareOLTPMySQLDatabase(EventContext telemetryContext, Cance
                 }
             }
         }
-
-        private string GetServerIpAddress()
-        {
-            string serverIPAddress = IPAddress.Loopback.ToString();
-
-            if (this.IsMultiRoleLayout())
-            {
-                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
-                IPAddress.TryParse(serverInstance.IPAddress, out IPAddress serverIP);
-                serverIPAddress = serverIP.ToString();
-            }
-
-            return serverIPAddress;
-        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchConfiguration.cs b/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchConfiguration.cs
@@ -134,19 +134,5 @@ private async Task PrepareTPCCMySQLDatabase(EventContext telemetryContext, Cance
                 }
             }
         }
-
-        private string GetServerIpAddress()
-        {
-            string serverIPAddress = IPAddress.Loopback.ToString();
-
-            if (this.IsMultiRoleLayout())
-            {
-                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
-                IPAddress.TryParse(serverInstance.IPAddress, out IPAddress serverIP);
-                serverIPAddress = serverIP.ToString();
-            }
-
-            return serverIPAddress;
-        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs
@@ -184,7 +184,6 @@ public string Action
             {
                 this.Parameters.TryGetValue(nameof(this.Action), out IConvertible action);
                 return action?.ToString();
-                // return this.Parameters.GetValue<string>(nameof(this.Action), null);
             }
         }
 

diff --git a/src/VirtualClient/VirtualClient.Contracts/EnvironmentLayoutExtensions.cs b/src/VirtualClient/VirtualClient.Contracts/EnvironmentLayoutExtensions.cs
@@ -6,6 +6,7 @@ namespace VirtualClient.Contracts
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Net;
 
     /// <summary>
     /// Extensions for <see cref="EnvironmentLayout"/> instances.
@@ -34,5 +35,23 @@ public static ClientInstance GetClientInstance(this EnvironmentLayout layout, st
 
             return clientInstances?.FirstOrDefault();
         }
+
+        /// <summary>
+        /// Returns first ServerIpAddress from the layout file in a client-server scenario.
+        /// </summary>
+        /// <param name="component">The component with the environment layout.</param>
+        /// <returns></returns>
+        public static string GetServerIpAddress(this VirtualClientComponent component)
+        {
+            string serverIPAddress = IPAddress.Loopback.ToString();
+
+            if (component.IsMultiRoleLayout())
+            {
+                ClientInstance serverInstance = component.GetLayoutClientInstances(ClientRole.Server).First();
+                serverIPAddress = serverInstance.IPAddress;
+            }
+
+            return serverIPAddress;
+        }
     }
 }
diff --git a/src/VirtualClient/VirtualClient.Dependencies/MySqlServer/MySqlServerConfiguration.cs b/src/VirtualClient/VirtualClient.Dependencies/MySqlServer/MySqlServerConfiguration.cs
@@ -299,20 +299,6 @@ private async Task<string> GetMySQLInMemoryCapacityAsync(CancellationToken cance
             return bufferSizeInMegaBytes.ToString();
         }
 
-        private string GetServerIpAddress()
-        {
-            string serverIPAddress = IPAddress.Loopback.ToString();
-
-            if (this.IsMultiRoleLayout())
-            {
-                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
-                IPAddress.TryParse(serverInstance.IPAddress, out IPAddress serverIP);
-                serverIPAddress = serverIP.ToString();
-            }
-
-            return serverIPAddress;
-        }
-
         private string GetClientIpAddresses()
         {
             string clientIpAddresses = string.Empty;

diff --git a/...irtualClient/VirtualClient.Dependencies/PostgreSQLServer/PostgreSQLServerConfiguration.cs b/...irtualClient/VirtualClient.Dependencies/PostgreSQLServer/PostgreSQLServerConfiguration.cs
@@ -272,20 +272,6 @@ private async Task<string> GetPostgreSQLInnodbDirectoriesAsync(CancellationToken
             return diskPaths;
         }
 
-        private string GetServerIpAddress()
-        {
-            string serverIPAddress = IPAddress.Loopback.ToString();
-
-            if (this.IsMultiRoleLayout())
-            {
-                ClientInstance serverInstance = this.GetLayoutClientInstances(ClientRole.Server).First();
-                IPAddress.TryParse(serverInstance.IPAddress, out IPAddress serverIP);
-                serverIPAddress = serverIP.ToString();
-            }
-
-            return serverIPAddress;
-        }
-
         /// <summary>
         /// Supported PostgreSQL Server configuration actions.
         /// </summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,7 +184,6 @@ public string Action @@
                 {
                     this.Parameters.TryGetValue(nameof(this.Action), out IConvertible action);
                     return action?.ToString();
-                    // return this.Parameters.GetValue<string>(nameof(this.Action), null);
                 }
             }
@@ Expand Down @@