Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mysql minor changes and sysbench cleanup addition #454

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+138 −29
Open

mysql minor changes and sysbench cleanup addition #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d630c41
adding sysbench version
nmalkapuram Mar 3, 2025
4444a8f
adding cleanup for sysbench
nmalkapuram Mar 3, 2025
5d30d4c
fixing command line and metadata
nmalkapuram Mar 4, 2025
8fa9348
fixing unittests
nmalkapuram Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/VirtualClient/VirtualClient.Actions.UnitTests/Examples/Sysbench/SysbenchExample1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
sysbench 1.1.0 (using bundled LuaJIT 2.1.0-beta3)

Running the test with following options:
Number of threads: 8
Initializing random number generator from current time


Initializing worker threads...

Threads started!

SQL statistics:
queries performed:
read: 9720106
write: 0
other: 0
total: 9720106
transactions: 9720106 (32400.24 per sec.)
queries: 9720106 (32400.24 per sec.)
ignored errors: 0 (0.00 per sec.)
reconnects: 0 (0.00 per sec.)

Throughput:
events/s (eps): 32400.2399
time elapsed: 300.0011s
total number of events: 9720106

Latency (ms):
min: 0.16
avg: 0.25
max: 13.68
95th percentile: 0.28
sum: 2389444.97

Threads fairness:
events (avg/stddev): 1215013.2500/22596.17
execution time (avg/stddev): 298.6806/0.05

8 changes: 4 additions & 4 deletions src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchConfigurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public async Task SysbenchConfigurationSkipsSysbenchInitialization()

string[] expectedCommands =
{
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --tableCount 10 --recordCount 1000 --threadCount 8 --password [A-Za-z0-9+/=]+",
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --threadCount 8 --tableCount 10 --recordCount 1000 --password [A-Za-z0-9+/=]+",
};

int commandNumber = 0;
Expand Down Expand Up @@ -122,7 +122,7 @@ public async Task SysbenchConfigurationPreparesDatabase()
string[] expectedCommands =
{
$"python3 {this.mockPackagePath}/configure-workload-generator.py --distro Ubuntu --databaseSystem MySQL --packagePath {this.mockPackagePath}",
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --tableCount 10 --recordCount 1000 --threadCount 8 --password [A-Za-z0-9+/=]+",
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --threadCount 8 --tableCount 10 --recordCount 1000 --password [A-Za-z0-9+/=]+",
};

int commandNumber = 0;
Expand Down Expand Up @@ -173,7 +173,7 @@ public async Task SysbenchConfigurationUsesDefinedParametersWhenRunningTheWorklo
string[] expectedCommands =
{
$"python3 {this.mockPackagePath}/configure-workload-generator.py --distro Ubuntu --databaseSystem MySQL --packagePath {this.mockPackagePath}",
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --tableCount 40 --recordCount 1000 --threadCount 16 --password [A-Za-z0-9+/=]+",
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark OLTP --threadCount 16 --tableCount 40 --recordCount 1000 --password [A-Za-z0-9+/=]+",
};

int commandNumber = 0;
Expand Down Expand Up @@ -386,7 +386,7 @@ public async Task SysbenchConfigurationProperlyExecutesPostgreSQLOLTPConfigurabl

string[] expectedCommands =
{
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem PostgreSQL --benchmark OLTP --tableCount 40 --recordCount 1000 --threadCount 16 --password [A-Za-z0-9+/=]+"
$"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem PostgreSQL --benchmark OLTP --threadCount 16 --tableCount 40 --recordCount 1000 --password [A-Za-z0-9+/=]+"
};

int commandNumber = 0;
Expand Down
12 changes: 12 additions & 0 deletions src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,17 @@ public void SysbenchParserParsesCorrectly()
MetricAssert.Exists(metrics, "latency p95", 68.05, "milliseconds");
MetricAssert.Exists(metrics, "latency sum", 7458385.25, "milliseconds");
}

[Test]
public void SysbenchParserParsesMetricsMetadataCorrectly()
{
string rawText = File.ReadAllText(Path.Combine(examplesDirectory, "SysbenchExample1.txt"));
SysbenchMetricsParser parser = new SysbenchMetricsParser(rawText);

IList<Metric> metrics = parser.Parse();
Assert.AreEqual(17, metrics.Count);
Assert.IsTrue(metrics[0].Metadata.ContainsKey("sysbench_version"));
Assert.IsTrue(metrics[0].Metadata["sysbench_version"].Equals("1.1.0"));
}
}
}
51 changes: 49 additions & 2 deletions src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchClientExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace VirtualClient.Actions
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Identity.Client;
using Polly;
using VirtualClient.Common;
using VirtualClient.Common.Extensions;
Expand Down Expand Up @@ -140,6 +141,20 @@ private void CaptureMetrics(IProcessProxy process, EventContext telemetryContext
{
SysbenchMetricsParser parser = new SysbenchMetricsParser(text);
IList<Metric> metrics = parser.Parse();
string sysbenchVersion = null;

var sysbenchVersionMetric = metrics.FirstOrDefault();
if (sysbenchVersionMetric != null && sysbenchVersionMetric.Metadata.TryGetValue("sysbench_version", out var versionValue))
{
sysbenchVersion = versionValue?.ToString();
}

if (!string.IsNullOrEmpty(sysbenchVersion))
{
this.MetadataContract.Add("sysbench_version", sysbenchVersion, MetadataContractCategory.Dependencies);
}

this.MetadataContract.Apply(telemetryContext);

this.Logger.LogMetrics(
toolName: "Sysbench",
Expand All @@ -150,7 +165,8 @@ private void CaptureMetrics(IProcessProxy process, EventContext telemetryContext
null,
scenarioArguments: this.sysbenchLoggingArguments,
this.Tags,
telemetryContext);
telemetryContext,
toolVersion: sysbenchVersion);
}
catch (Exception exc)
{
Expand Down Expand Up @@ -182,6 +198,10 @@ private Task ExecuteWorkloadAsync(EventContext telemetryContext, CancellationTok
{
await this.PrepareOLTPMySQLDatabase(telemetryContext, cancellationToken);
}
else if (this.Action == ClientAction.Cleanup)
{
await this.CleanUpDatabase(telemetryContext, cancellationToken);
}
else
{
await this.RunOLTPWorkloadAsync(telemetryContext, cancellationToken);
Expand Down Expand Up @@ -229,6 +249,33 @@ private async Task RunOLTPWorkloadAsync(EventContext telemetryContext, Cancellat
}
}

private async Task CleanUpDatabase(EventContext telemetryContext, CancellationToken cancellationToken)
{
int tableCount = GetTableCount(this.DatabaseScenario, this.TableCount, this.Workload);

string serverIp = (this.GetLayoutClientInstances(ClientRole.Server, false) ?? Enumerable.Empty<ClientInstance>())
.FirstOrDefault()?.IPAddress
?? "localhost";

string sysbenchCleanupArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --tableCount {tableCount} --hostIpAddress {serverIp}";

string script = $"{this.SysbenchPackagePath}/cleanup-database.py ";

using (IProcessProxy process = await this.ExecuteCommandAsync(
SysbenchExecutor.PythonCommand,
script + sysbenchCleanupArguments,
this.SysbenchPackagePath,
telemetryContext,
cancellationToken))
{
if (!cancellationToken.IsCancellationRequested)
{
await this.LogProcessDetailsAsync(process, telemetryContext, "Sysbench", logToFile: true);
process.ThrowIfErrored<WorkloadException>(process.StandardError.ToString(), ErrorReason.WorkloadFailed);
}
}
}

private async Task RunTPCCWorkloadAsync(EventContext telemetryContext, CancellationToken cancellationToken)
{
int tableCount = GetTableCount(this.Scenario, this.TableCount, this.Workload);
Expand Down Expand Up @@ -288,7 +335,7 @@ private async Task PrepareOLTPMySQLDatabase(EventContext telemetryContext, Cance
int threadCount = GetThreadCount(this.SystemManager, this.DatabaseScenario, this.Threads);
int recordCount = GetRecordCount(this.SystemManager, this.DatabaseScenario, this.RecordCount);

this.sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --tableCount {tableCount} --recordCount {recordCount} --threadCount {threadCount}";
this.sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --threadCount {threadCount} --tableCount {tableCount} --recordCount {recordCount}";
this.sysbenchPrepareArguments = $"{this.sysbenchLoggingArguments} --password {this.SuperUserPassword}";

string serverIp = (this.GetLayoutClientInstances(ClientRole.Server, false) ?? Enumerable.Empty<ClientInstance>())
Expand Down
2 changes: 1 addition & 1 deletion src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private async Task PrepareOLTPMySQLDatabase(EventContext telemetryContext, Cance
int threadCount = GetThreadCount(this.SystemManager, this.DatabaseScenario, this.Threads);
int recordCount = GetRecordCount(this.SystemManager, this.DatabaseScenario, this.RecordCount);

string sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --tableCount {tableCount} --recordCount {recordCount} --threadCount {threadCount}";
string sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --threadCount {threadCount} --tableCount {tableCount} --recordCount {recordCount}";
this.sysbenchPrepareArguments = $"{sysbenchLoggingArguments} --password {this.SuperUserPassword}";

string serverIp = "localhost";
Expand Down
9 changes: 7 additions & 2 deletions src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ protected void AddMetric(string arguments, IProcessProxy process, EventContext t

List<Metric> metrics = new List<Metric>();
double duration = (process.ExitTime - process.StartTime).TotalMinutes;
metrics.Add(new Metric("PopulateDatabaseTime_Minutes ", duration, "minutes", MetricRelativity.LowerIsBetter));
metrics.Add(new Metric("PopulateDatabaseDuration", duration, "minutes", MetricRelativity.LowerIsBetter));

this.Logger.LogMetrics(
toolName: "Sysbench",
Expand Down Expand Up @@ -532,9 +532,14 @@ internal class ClientAction
public const string TruncateDatabase = nameof(TruncateDatabase);

/// <summary>
/// Truncates all tables existing in database
/// Runs specified workload.
/// </summary>
public const string RunWorkload = nameof(RunWorkload);

/// <summary>
/// Runs sysbench cleanup action.
/// </summary>
public const string Cleanup = nameof(Cleanup);
}
}
}
45 changes: 26 additions & 19 deletions src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchMetricsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class SysbenchMetricsParser : MetricsParser
private const string ReconnectsPerSecond = "reconnects/sec";
private const string Second = "seconds";
private const string MilliSecond = "milliseconds";
private Dictionary<string, IConvertible> metricMetadata = new Dictionary<string, IConvertible>();

/// <summary>
/// Constructor for <see cref="SysbenchMetricsParser"/>
Expand All @@ -32,29 +33,32 @@ public SysbenchMetricsParser(string rawText)
/// <inheritdoc/>
public override IList<Metric> Parse()
{
var match = Regex.Match(this.RawText, @"sysbench\s+([\d]+\.[\d]+\.[\d]+(?:-\w+)?)");
string sysbenchversion = match.Success ? match.Groups[1].Value : string.Empty;
this.metricMetadata["sysbench_version"] = sysbenchversion;
this.Preprocess();
List<Metric> metrics = new List<Metric>();

// Create list of Metrics Info
List<MetricInfo> metricInfoList = new List<MetricInfo>()
{
new MetricInfo("# read queries", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("# write queries", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("# other queries", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("# transactions", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("transactions/sec", TransactionsPerSecond, MetricRelativity.HigherIsBetter),
new MetricInfo("# queries", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("queries/sec", QueriesPerSecond, MetricRelativity.HigherIsBetter),
new MetricInfo("# ignored errors", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("ignored errors/sec", IgnoredErrorsPerSecond, MetricRelativity.HigherIsBetter),
new MetricInfo("# reconnects", string.Empty, MetricRelativity.HigherIsBetter),
new MetricInfo("reconnects/sec", ReconnectsPerSecond, MetricRelativity.HigherIsBetter),
new MetricInfo("elapsed time", Second, MetricRelativity.LowerIsBetter),
new MetricInfo("latency min", MilliSecond, MetricRelativity.LowerIsBetter),
new MetricInfo("latency avg", MilliSecond, MetricRelativity.LowerIsBetter),
new MetricInfo("latency max", MilliSecond, MetricRelativity.LowerIsBetter),
new MetricInfo("latency p95", MilliSecond, MetricRelativity.LowerIsBetter),
new MetricInfo("latency sum", MilliSecond, MetricRelativity.LowerIsBetter),
new MetricInfo("# read queries", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# write queries", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# other queries", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# transactions", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("transactions/sec", TransactionsPerSecond, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# queries", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("queries/sec", QueriesPerSecond, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# ignored errors", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("ignored errors/sec", IgnoredErrorsPerSecond, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("# reconnects", string.Empty, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("reconnects/sec", ReconnectsPerSecond, MetricRelativity.HigherIsBetter, metadata: this.metricMetadata),
new MetricInfo("elapsed time", Second, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
new MetricInfo("latency min", MilliSecond, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
new MetricInfo("latency avg", MilliSecond, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
new MetricInfo("latency max", MilliSecond, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
new MetricInfo("latency p95", MilliSecond, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
new MetricInfo("latency sum", MilliSecond, MetricRelativity.LowerIsBetter, metadata: this.metricMetadata),
};

if (!string.IsNullOrEmpty(this.PreprocessedText))
Expand Down Expand Up @@ -84,7 +88,7 @@ public override IList<Metric> Parse()
{
MetricInfo metricInfo = metricInfoList[metricInfoIndex];
Match m = mc[mcIndex];
metrics.Add(new Metric($"{metricInfo.Name}", Convert.ToDouble(m.Value), metricInfo.Unit, metricInfo.Relativity));
metrics.Add(new Metric($"{metricInfo.Name}", Convert.ToDouble(m.Value), metricInfo.Unit, metricInfo.Relativity, metadata: metricInfo.Metadata));
metricInfoIndex++;
}

Expand All @@ -107,18 +111,21 @@ protected override void Preprocess()
// helper class that contains Metric Name, Unit, and Relativity
private class MetricInfo
{
public MetricInfo(string name, string unit, MetricRelativity relativity)
public MetricInfo(string name, string unit, MetricRelativity relativity, Dictionary<string, IConvertible> metadata)
{
this.Name = name;
this.Unit = unit;
this.Relativity = relativity;
this.Metadata = metadata;
}

public string Name { get; set; }

public string Unit { get; set; }

public MetricRelativity Relativity { get; set; }

public Dictionary<string, IConvertible> Metadata { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion src/VirtualClient/VirtualClient.Main/profiles/PERF-POSTGRESQL-SYSBENCH-OLTP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"Parameters": {
"Scenario": "DownloadSysbenchPackage",
"BlobContainer": "packages",
"BlobName": "sysbench-1.0.20.rev2.zip",
"BlobName": "sysbench-1.0.20.rev3.zip",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the clean up python the only change in rev3? Please put the scripts as scripts in VC source, in that way I could review the changes. Otherwise you need to document what has changed that are not in the source

"PackageName": "sysbench",
"Extract": true
}
Expand Down
Loading