Skip to content

Users/nmalkapuram/fixing redis and memcached profiles #287

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

Merged
nmalkapuram merged 8 commits into from
Mar 28, 2024
Merged

Users/nmalkapuram/fixing redis and memcached profiles #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aea41ba
Adding username detection logic
nmalkapuram Jan 15, 2024
df324db
updating unit tests and resolving comments
nmalkapuram Jan 15, 2024
ad07f4f
removing unused library reference
nmalkapuram Jan 22, 2024
5ede96f
Adding username detection logic
nmalkapuram Jan 15, 2024
fd870e3
updating unit tests and resolving comments
nmalkapuram Jan 15, 2024
3030598
removing unused library reference
nmalkapuram Jan 22, 2024
287b6e4
fixing redis for TLS situation and updating memcached profile with ap…
nmalkapuram Mar 27, 2024
5a0d4be
updating document
nmalkapuram Mar 28, 2024
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
91 changes: 91 additions & 0 deletions src/VirtualClient/VirtualClient.Core.UnitTests/ProfileExpressionEvaluatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,97 @@ public async Task ProfileExpressionEvaluatorParameterSetExpressionsFollowTheCase
Assert.AreEqual("--port=1234", parameters2["CommandLine"].ToString());
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsTernaryFunctionReferencesInParameterSets_Scenario_1()
{
this.SetupDefaults(PlatformID.Win32NT);

// "BUILD_TLS": "{calculate({IsTLSEnabled} ? \"yes\" : \"no\" )}",
// {calculate(calculate(512 / (4 / 2)) ? "Yes" : "No")}
Dictionary<string, IConvertible> parameters = new Dictionary<string, IConvertible>
{
{ "BUILD_TLS", "{calculate({IsTLSEnabled} ? \"yes\" : \"no\" )}" },
{ "IsTLSEnabled" , true }
};

await ProfileExpressionEvaluator.Instance.EvaluateAsync(this.mockFixture.Dependencies, parameters);

Assert.AreEqual("yes", parameters["BUILD_TLS"]);
Assert.AreEqual(true, parameters["IsTLSEnabled"]);
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsTernaryFunctionReferencesInParameterSets_Scenario_2()
{
this.SetupDefaults(PlatformID.Win32NT);

// "BUILD_TLS": "{calculate({calculate(512 == 2)} ? "Yes" : "No")}",
Dictionary<string, IConvertible> parameters = new Dictionary<string, IConvertible>
{
{ "BUILD_TLS", "{calculate({calculate(512 == 2)} ? \"Yes\" : \"No\")}" },
{ "IsTLSEnabled" , true }
};

await ProfileExpressionEvaluator.Instance.EvaluateAsync(this.mockFixture.Dependencies, parameters);

Assert.AreEqual("No", parameters["BUILD_TLS"]);
Assert.AreEqual(true, parameters["IsTLSEnabled"]);
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsTernaryFunctionReferencesInParameterSets_Scenario_3()
{
this.SetupDefaults(PlatformID.Win32NT);

// "BUILD_TLS": "{calculate({calculate(512 != 2)} ? "Yes" : "No")}",
Dictionary<string, IConvertible> parameters = new Dictionary<string, IConvertible>
{
{ "BUILD_TLS", "{calculate({calculate(512 != 2)} ? \"Yes\" : \"No\")}" },
{ "IsTLSEnabled" , true }
};

await ProfileExpressionEvaluator.Instance.EvaluateAsync(this.mockFixture.Dependencies, parameters);

Assert.AreEqual("Yes", parameters["BUILD_TLS"]);
Assert.AreEqual(true, parameters["IsTLSEnabled"]);
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsTernaryFunctionReferencesInParameterSets_Scenario_4()
{
this.SetupDefaults(PlatformID.Win32NT);

// "BUILD_TLS": "{calculate({calculate(512 >= 2)} ? "Yes" : "No")}",
Dictionary<string, IConvertible> parameters = new Dictionary<string, IConvertible>
{
{ "BUILD_TLS", "{calculate({calculate(512 >= 2)} ? \"Yes\" : \"No\")}" },
{ "IsTLSEnabled" , true }
};

await ProfileExpressionEvaluator.Instance.EvaluateAsync(this.mockFixture.Dependencies, parameters);

Assert.AreEqual("Yes", parameters["BUILD_TLS"]);
Assert.AreEqual(true, parameters["IsTLSEnabled"]);
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsTernaryFunctionReferencesInParameterSets_Scenario_5()
{
this.SetupDefaults(PlatformID.Win32NT);

// "BUILD_TLS": "{calculate({calculate(512 >= 2)} ? "Yes" : "No")}",
Dictionary<string, IConvertible> parameters = new Dictionary<string, IConvertible>
{
{ "BUILD_TLS", "{calculate({calculate(512 < 2)} ? \"Yes\" : \"No\")}" },
{ "IsTLSEnabled" , true }
};

await ProfileExpressionEvaluator.Instance.EvaluateAsync(this.mockFixture.Dependencies, parameters);

Assert.AreEqual("No", parameters["BUILD_TLS"]);
Assert.AreEqual(true, parameters["IsTLSEnabled"]);
}

[Test]
public async Task ProfileExpressionEvaluatorSupportsFunctionReferencesInParameterSets_Scenario_1()
{
Expand Down
79 changes: 79 additions & 0 deletions src/VirtualClient/VirtualClient.Core/ProfileExpressionEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ namespace VirtualClient
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Scripting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileSystemGlobbing.Internal;
using VirtualClient.Common.Extensions;
using VirtualClient.Contracts;

Expand All @@ -26,6 +28,21 @@ public class ProfileExpressionEvaluator : IExpressionEvaluator
@"\{calculate\(([0-9\*\/\+\-\(\)\s]+)\)\}",
RegexOptions.Compiled | RegexOptions.IgnoreCase);

// e.g.
// {calculate({IsTLSEnabled} ? "Yes" : "No")}
// (([^?]+)\s*\?\s*([^:]+)\s*:\s*([^)]+))
private static readonly Regex CalculateTernaryExpression = new Regex(
@"\{calculate\((([^?]+)\s*\?\s*([^:]+)\s*:\s*([^)]+))\)\}",
RegexOptions.Compiled | RegexOptions.IgnoreCase);

// e.g.
// Expression: {calculate(512 == 4)}
// Expression: {calculate(512 > 2)}
// Expression: {calculate(512 != {LogicalCoreCount})}
private static readonly Regex CalculateComparisionExpression = new Regex(
@"\{calculate\((\d+\s*(?:==|!=|<|>|<=|>=|&&|\|\|)\s*\d+)\)\}",
RegexOptions.Compiled | RegexOptions.IgnoreCase);

// e.g.
// {Expression...}
private static readonly Regex GeneralExpression = new Regex(
Expand Down Expand Up @@ -429,6 +446,68 @@ public class ProfileExpressionEvaluator : IExpressionEvaluator
}
}

return new EvaluationResult
{
IsMatched = isMatched,
Outcome = evaluatedExpression
};
}),
// Expression: {calculate(512 == 4)}
// Expression: {calculate(512 > 2)}
// Expression: {calculate(512 != {LogicalCoreCount})}
// **IMPORTANT**
// This expression evaluation MUST come last after arthematic caluculation evaluators.
new Func<IServiceCollection, IDictionary<string, IConvertible>, string, Task<EvaluationResult>>(async (dependencies, parameters, expression) =>
{
bool isMatched = false;
string evaluatedExpression = expression;
MatchCollection matches = ProfileExpressionEvaluator.CalculateComparisionExpression.Matches(expression);

if (matches?.Any() == true)
{
isMatched = true;
foreach (Match match in matches)
{
string function = match.Groups[1].Value;
bool result = await Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.EvaluateAsync<bool>(function);

evaluatedExpression = evaluatedExpression.Replace(match.Value, result.ToString());
}
}

return new EvaluationResult
{
IsMatched = isMatched,
Outcome = evaluatedExpression
};
}),
// Expression: {calculate({IsTLSEnabled} ? "Yes" : "No")}
// Expression: {calculate(calculate(512 == 2) ? "Yes" : "No")}
// **IMPORTANT**
// This expression evaluation MUST come last after arthematic/logical/comparative caluculation evaluators.
new Func<IServiceCollection, IDictionary<string, IConvertible>, string, Task<EvaluationResult>>(async (dependencies, parameters, expression) =>
{
bool isMatched = false;
string evaluatedExpression = expression;
MatchCollection matches = ProfileExpressionEvaluator.CalculateTernaryExpression.Matches(expression);

if (matches?.Any() == true)
{
isMatched = true;
foreach (Match match in matches)
{
string function = match.Groups[1].Value;

function = Regex.Replace(function, @"(?<=\b)(True|False)(?=\s*\?)", m =>
{
return m.Value.ToLower();
});

string result = await Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScript.EvaluateAsync<string>(function);
evaluatedExpression = evaluatedExpression.Replace(match.Value, result.ToString());
}
}

return new EvaluationResult
{
IsMatched = isMatched,
Expand Down
41 changes: 26 additions & 15 deletions src/VirtualClient/VirtualClient.Main/profiles/PERF-MEMCACHED.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"ServerMaxConnections": 16384,
"ClientInstances": 8,
"Duration": "00:02:00",
"Username": null,
"PerProcessMetric": false
"EmitAggregateMetrics": false,
"EmitRawMetrics": true
},
"Actions": [
{
Expand All @@ -23,7 +23,6 @@
"CommandLine": "-p {Port} -t 4 -m 30720 -c {ServerMaxConnections}",
"BindToCores": true,
"Port": "$.Parameters.ServerPort",
"Username": "$.Parameters.Username",
"ServerThreadCount": 4,
"ServerMaxConnections": "$.Parameters.ServerMaxConnections",
"Role": "Server"
Expand All @@ -37,7 +36,8 @@
"CommandLine": "--protocol memcache_text --threads 1 --clients 1 --ratio 1:0 --data-size 32 --pipeline 32 --key-minimum 1 --key-maximum 10000000 --key-prefix sm --key-pattern S:S --run-count 1 --requests=allkeys",
"ClientInstances": 1,
"WarmUp": true,
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -49,7 +49,8 @@
"CommandLine": "--protocol memcache_text --threads 1 --clients 1 --ratio 1:0 --data-size 1024 --pipeline 32 --key-minimum 1 --key-maximum 1000000 --key-prefix med --key-pattern S:S --run-count 1 --requests=allkeys",
"ClientInstances": 1,
"WarmUp": true,
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -61,7 +62,8 @@
"CommandLine": "--protocol memcache_text --threads 1 --clients 1 --ratio 1:0 --data-size 10240 --pipeline 32 --key-minimum 1 --key-maximum 100000 --key-prefix lg --key-pattern S:S --run-count 1 --requests=allkeys",
"ClientInstances": 1,
"WarmUp": true,
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -73,7 +75,8 @@
"CommandLine": "--protocol memcache_text --threads 8 --clients 16 --ratio 1:1 --data-size 32 --pipeline 100 --key-minimum 1 --key-maximum 10000000 --key-prefix sm --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -85,7 +88,8 @@
"CommandLine": "--protocol memcache_text --threads 8 --clients 16 --ratio 1:1 --data-size 1024 --pipeline 100 --key-minimum 1 --key-maximum 1000000 --key-prefix med --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -97,7 +101,8 @@
"CommandLine": "--protocol memcache_text --threads 8 --clients 16 --ratio 1:1 --data-size 10240 --pipeline 100 --key-minimum 1 --key-maximum 100000 --key-prefix lg --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -109,7 +114,8 @@
"CommandLine": "--protocol memcache_text --threads 16 --clients 16 --ratio 1:1 --data-size 32 --pipeline 100 --key-minimum 1 --key-maximum 10000000 --key-prefix sm --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -121,7 +127,8 @@
"CommandLine": "--protocol memcache_text --threads 16 --clients 16 --ratio 1:1 --data-size 1024 --pipeline 100 --key-minimum 1 --key-maximum 1000000 --key-prefix med --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -133,7 +140,8 @@
"CommandLine": "--protocol memcache_text --threads 16 --clients 16 --ratio 1:1 --data-size 10240 --pipeline 100 --key-minimum 1 --key-maximum 100000 --key-prefix lg --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -145,7 +153,8 @@
"CommandLine": "--protocol memcache_text --threads 32 --clients 16 --ratio 1:1 --data-size 32 --pipeline 100 --key-minimum 1 --key-maximum 10000000 --key-prefix sm --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -157,7 +166,8 @@
"CommandLine": "--protocol memcache_text --threads 32 --clients 16 --ratio 1:1 --data-size 1024 --pipeline 100 --key-minimum 1 --key-maximum 1000000 --key-prefix med --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
},
Expand All @@ -169,7 +179,8 @@
"CommandLine": "--protocol memcache_text --threads 32 --clients 16 --ratio 1:1 --data-size 10240 --pipeline 100 --key-minimum 1 --key-maximum 100000 --key-prefix lg --key-pattern R:R --run-count 1 --print-percentiles 50,90,95,99,99.9 --random-data --test-time {Duration}",
"ClientInstances": "$.Parameters.ClientInstances",
"Duration": "$.Parameters.Duration",
"PerProcessMetric": "$.Parameters.PerProcessMetric",
"EmitAggregateMetrics": "$.Parameters.EmitAggregateMetrics",
"EmitRawMetrics": "$.Parameters.EmitRawMetrics",
"Role": "Client"
}
}
Expand Down
15 changes: 8 additions & 7 deletions src/VirtualClient/VirtualClient.Main/profiles/PERF-REDIS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,14 @@
},
{
"Type": "ExecuteCommand",
"Parameters": {
"Scenario": "CompileRedis",
"SupportedPlatforms": "linux-x64,linux-arm64",
"BUILD_TLS": "$.Parameters.IsTLSEnabled",
"Command": "make BUILD_TLS={BUILD_TLS}",
"WorkingDirectory": "{PackagePath:redis}"
}
"Parameters": {
"Scenario": "CompileRedis",
"SupportedPlatforms": "linux-x64,linux-arm64",
"IsTLSEnabled": "$.Parameters.IsTLSEnabled",
"BUILD_TLS": "{calculate({IsTLSEnabled} ? \"yes\" : \"no\" )}",
"Command": "make BUILD_TLS={BUILD_TLS}",
"WorkingDirectory": "{PackagePath:redis}"
}
},
{
"Type": "GitRepoClone",
Expand Down
Loading