Skip to content

[Perf] Support multiple test proxies #24265

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
mikeharder merged 2 commits into from
Sep 28, 2021
Merged

[Perf] Support multiple test proxies #24265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
378eed9
Support multiple test proxies
mikeharder Sep 28, 2021
0d0ea7e
Improve help text
mikeharder Sep 28, 2021
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
5 changes: 3 additions & 2 deletions common/Perf/Azure.Test.Perf/PerfOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using CommandLine;
using System;
using System.Collections.Generic;

namespace Azure.Test.Perf
{
Expand Down Expand Up @@ -50,8 +51,8 @@ public class PerfOptions
[Option("sync", HelpText = "Runs sync version of test")]
public bool Sync { get; set; }

[Option('x', "test-proxy", HelpText = "URI of TestProxy Server")]
public Uri TestProxy { get; set; }
[Option('x', "test-proxies", Separator = ';', HelpText = "URIs of TestProxy Servers (separated by ';')")]
public IEnumerable<Uri> TestProxies { get; set; }

[Option('w', "warmup", Default = 5, HelpText = "Duration of warmup in seconds")]
public int Warmup { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion common/Perf/Azure.Test.Perf/PerfProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private static async Task Run(Type testType, PerfOptions options)
setupStatusCts.Cancel();
setupStatusThread.Join();

if (options.TestProxy != null)
if (options.TestProxies != null && options.TestProxies.Any())
{
using var recordStatusCts = new CancellationTokenSource();
var recordStatusThread = PerfStressUtilities.PrintStatus("=== Record and Start Playback ===", () => ".", newLine: false, recordStatusCts.Token);
Expand Down
18 changes: 12 additions & 6 deletions common/Perf/Azure.Test.Perf/PerfTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,20 @@ public abstract class PerfTest<TOptions> : IPerfTest where TOptions : PerfOption
private readonly HttpPipelineTransport _insecureTransport;

private readonly HttpClient _recordPlaybackHttpClient;
private readonly Uri _testProxy;
private readonly TestProxyPolicy _testProxyPolicy;

private string _recordingId;

protected TOptions Options { get; private set; }

private static int _globalParallelIndex;
protected int ParallelIndex { get; }

public PerfTest(TOptions options)
{
Options = options;
ParallelIndex = Interlocked.Increment(ref _globalParallelIndex) - 1;

if (Options.Insecure)
{
Expand All @@ -48,7 +53,7 @@ public PerfTest(TOptions options)
}
}

if (Options.TestProxy != null)
if (Options.TestProxies != null && Options.TestProxies.Any())
{
if (Options.Insecure)
{
Expand All @@ -62,7 +67,8 @@ public PerfTest(TOptions options)
_recordPlaybackHttpClient = new HttpClient();
}

_testProxyPolicy = new TestProxyPolicy(Options.TestProxy);
_testProxy = Options.TestProxies.ElementAt(ParallelIndex % Options.TestProxies.Count());
_testProxyPolicy = new TestProxyPolicy(_testProxy);
}
}

Expand Down Expand Up @@ -125,7 +131,7 @@ public async Task RecordAndStartPlayback()

public async Task StopPlayback()
{
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(Options.TestProxy, "/playback/stop"));
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(_testProxy, "/playback/stop"));
message.Headers.Add("x-recording-id", _recordingId);
message.Headers.Add("x-purge-inmemory-recording", bool.TrueString);

Expand Down Expand Up @@ -182,23 +188,23 @@ protected static string GetEnvironmentVariable(string name)

private async Task StartRecording()
{
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(Options.TestProxy, "/record/start"));
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(_testProxy, "/record/start"));

var response = await _recordPlaybackHttpClient.SendAsync(message);
_recordingId = response.Headers.GetValues("x-recording-id").Single();
}

private async Task StopRecording()
{
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(Options.TestProxy, "/record/stop"));
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(_testProxy, "/record/stop"));
message.Headers.Add("x-recording-id", _recordingId);

await _recordPlaybackHttpClient.SendAsync(message);
}

private async Task StartPlayback()
{
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(Options.TestProxy, "/playback/start"));
var message = new HttpRequestMessage(HttpMethod.Post, new Uri(_testProxy, "/playback/start"));
message.Headers.Add("x-recording-id", _recordingId);

var response = await _recordPlaybackHttpClient.SendAsync(message);
Expand Down