Add h2load benchmark scenarios and improve local perf client (#193)

JamesNK · web-flow · commit 2b1ad6d454ea · 2019-09-04T16:42:15.000+12:00
diff --git a/Grpc.DotNet.sln b/Grpc.DotNet.sln
@@ -89,8 +89,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{310E57
 		perf\benchmarkapps\Shared\ca.crt = perf\benchmarkapps\Shared\ca.crt
 		perf\benchmarkapps\Shared\client.crt = perf\benchmarkapps\Shared\client.crt
 		perf\benchmarkapps\Shared\client.key = perf\benchmarkapps\Shared\client.key
+		perf\benchmarkapps\Shared\data.proto = perf\benchmarkapps\Shared\data.proto
 		perf\benchmarkapps\Shared\greet.proto = perf\benchmarkapps\Shared\greet.proto
-		perf\benchmarkapps\Shared\Greeter.cs = perf\benchmarkapps\Shared\Greeter.cs
+		perf\benchmarkapps\Shared\GreetService.cs = perf\benchmarkapps\Shared\GreetService.cs
 		perf\benchmarkapps\Shared\server.pfx = perf\benchmarkapps\Shared\server.pfx
 	EndProjectSection
 EndProject
diff --git a/perf/benchmarkapps/BenchmarkClient/BenchmarkClient.csproj b/perf/benchmarkapps/BenchmarkClient/BenchmarkClient.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <Protobuf Include="..\Shared\greet.proto" GrpcServices="Client" Link="Protos\greet.proto" />
+    <Protobuf Include="..\Shared\data.proto" GrpcServices="Client" Link="Protos\data.proto" />
 
     <Compile Include="$(MSBuildThisFileDirectory)..\..\Shared\*.cs" />
 
diff --git a/perf/benchmarkapps/BenchmarkClient/Program.cs b/perf/benchmarkapps/BenchmarkClient/Program.cs
@@ -27,8 +27,9 @@ namespace BenchmarkClient
 {
     class Program
     {
-        private const int Connections = 1;
-        private const int DurationSeconds = 5;
+        private const int Connections = 8;
+        private const int DurationSeconds = 15;
+        private const bool UseClientCertificate = false;
         // The host name is tied to some certificates
         private const string Target = "localhost:50051";
         private readonly static bool StopOnError = false;
@@ -39,11 +40,11 @@ static async Task Main(string[] args)
 
             var benchmarkResults = new List<BenchmarkResult>();
 
-            benchmarkResults.Add(await ExecuteBenchmark("GrpcHttpClientUnary", id => new GrpcHttpClientUnaryWorker(id, "https://" + Target)));
-            benchmarkResults.Add(await ExecuteBenchmark("JsonRaw", id => new JsonWorker(id, Target, "/raw/greeter")));
-            benchmarkResults.Add(await ExecuteBenchmark("JsonMvc", id => new JsonWorker(id, Target, "/api/greeter")));
-            benchmarkResults.Add(await ExecuteBenchmark("GrpcCoreUnary", id => new GrpcCoreUnaryWorker(id, Target, useClientCertificate: true)));
-            benchmarkResults.Add(await ExecuteBenchmark("GrpcRawUnary", id => new GrpcRawUnaryWorker(id, Target)));
+            benchmarkResults.Add(await ExecuteBenchmark("GrpcHttpClientUnary", id => new GrpcHttpClientUnaryWorker(id, Target, UseClientCertificate)));
+            benchmarkResults.Add(await ExecuteBenchmark("JsonRaw", id => new JsonWorker(id, Target, UseClientCertificate, "/raw/greeter")));
+            benchmarkResults.Add(await ExecuteBenchmark("JsonMvc", id => new JsonWorker(id, Target, UseClientCertificate, "/api/greeter")));
+            benchmarkResults.Add(await ExecuteBenchmark("GrpcCoreUnary", id => new GrpcCoreUnaryWorker(id, Target, UseClientCertificate)));
+            benchmarkResults.Add(await ExecuteBenchmark("GrpcRawUnary", id => new GrpcRawUnaryWorker(id, Target, UseClientCertificate)));
 
             Log($"Results:");
 
diff --git a/perf/benchmarkapps/BenchmarkClient/Workers/GrpcCoreUnaryWorker.cs b/perf/benchmarkapps/BenchmarkClient/Workers/GrpcCoreUnaryWorker.cs
@@ -27,7 +27,7 @@ namespace BenchmarkClient.Workers
     public class GrpcCoreUnaryWorker : IWorker
     {
         private Channel? _channel;
-        private Greeter.GreeterClient? _client;
+        private GreetService.GreetServiceClient? _client;
         private bool _useClientCertificate;
 
         public GrpcCoreUnaryWorker(int id, string target, bool useClientCertificate)
@@ -53,7 +53,7 @@ public Task ConnectAsync()
                 : ChannelCredentials.Insecure;
 
             _channel = new Channel(Target, credentials);
-            _client = new Greeter.GreeterClient(_channel);
+            _client = new GreetService.GreetServiceClient(_channel);
 
             return _channel.ConnectAsync();
         }
diff --git a/perf/benchmarkapps/BenchmarkClient/Workers/GrpcHttpClientUnaryWorker.cs b/perf/benchmarkapps/BenchmarkClient/Workers/GrpcHttpClientUnaryWorker.cs
@@ -27,18 +27,20 @@ namespace BenchmarkClient.Workers
 {
     public class GrpcHttpClientUnaryWorker : IWorker
     {
+        private readonly bool _useClientCertificate;
         private readonly DateTime? _deadline;
-        private Greeter.GreeterClient? _client;
+        private GreetService.GreetServiceClient? _client;
 
-        public GrpcHttpClientUnaryWorker(int id, string baseUri, DateTime? deadline = null)
+        public GrpcHttpClientUnaryWorker(int id, string target, bool useClientCertificate, DateTime? deadline = null)
         {
             Id = id;
-            BaseUri = baseUri;
+            Target = target;
+            _useClientCertificate = useClientCertificate;
             _deadline = deadline;
         }
 
         public int Id { get; }
-        public string BaseUri { get; }
+        public string Target { get; }
 
         public async Task CallAsync()
         {
@@ -49,8 +51,11 @@ public async Task CallAsync()
 
         public Task ConnectAsync()
         {
-            var channel = GrpcChannel.ForAddress(new Uri(BaseUri, UriKind.RelativeOrAbsolute));
-            _client = new Greeter.GreeterClient(channel);
+            var url = _useClientCertificate ? "https://" : "http://";
+            url += Target;
+
+            var channel = GrpcChannel.ForAddress(new Uri(url, UriKind.RelativeOrAbsolute));
+            _client = new GreetService.GreetServiceClient(channel);
 
             return Task.CompletedTask;
         }
diff --git a/perf/benchmarkapps/BenchmarkClient/Workers/GrpcRawUnaryWorker.cs b/perf/benchmarkapps/BenchmarkClient/Workers/GrpcRawUnaryWorker.cs
@@ -30,13 +30,15 @@ namespace BenchmarkClient.Workers
 {
     public class GrpcRawUnaryWorker : IWorker
     {
+        private readonly bool _useClientCertificate;
         private readonly DateTime? _deadline;
         private HttpClient? _client;
 
-        public GrpcRawUnaryWorker(int id, string target, DateTime? deadline = null)
+        public GrpcRawUnaryWorker(int id, string target, bool useClientCertificate, DateTime? deadline = null)
         {
             Id = id;
             Target = target;
+            _useClientCertificate = useClientCertificate;
             _deadline = deadline;
         }
 
@@ -59,7 +61,10 @@ public async Task CallAsync()
             BinaryPrimitives.WriteUInt32BigEndian(data.AsSpan(1, 4), (uint)messageSize);
             messageBytes.CopyTo(data.AsSpan(5));
 
-            var request = new HttpRequestMessage(HttpMethod.Post, "https://" + Target + "/Greet.Greeter/SayHello");
+            var url = _useClientCertificate ? "https://" : "http://";
+            url += Target;
+
+            var request = new HttpRequestMessage(HttpMethod.Post, url + "/Greet.GreetService/SayHello");
             request.Version = new Version(2, 0);
             request.Content = new StreamContent(new MemoryStream(data));
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/grpc");
diff --git a/perf/benchmarkapps/BenchmarkClient/Workers/JsonWorker.cs b/perf/benchmarkapps/BenchmarkClient/Workers/JsonWorker.cs
@@ -29,13 +29,15 @@ namespace BenchmarkClient.Workers
 {
     public class JsonWorker : IWorker
     {
+        private readonly bool _useClientCertificate;
         private readonly string _path;
         private HttpClient? _client;
 
-        public JsonWorker(int id, string target, string path)
+        public JsonWorker(int id, string target, bool useClientCertificate, string path)
         {
             Id = id;
             Target = target;
+            _useClientCertificate = useClientCertificate;
             _path = path;
         }
 
@@ -52,7 +54,10 @@ public async Task CallAsync()
             var json = JsonConvert.SerializeObject(message);
             var data = Encoding.UTF8.GetBytes(json);
 
-            var request = new HttpRequestMessage(HttpMethod.Post, "https://" + Target + _path);
+            var url = _useClientCertificate ? "https://" : "http://";
+            url += Target;
+
+            var request = new HttpRequestMessage(HttpMethod.Post, url + _path);
             request.Version = new Version(2, 0);
             request.Content = new StreamContent(new MemoryStream(data));
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
diff --git a/perf/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj b/perf/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
@@ -13,13 +13,15 @@
 
   <ItemGroup>
     <Protobuf Include="..\Shared\greet.proto" GrpcServices="Server" Link="Protos\greet.proto" />
+    <Protobuf Include="..\Shared\data.proto" GrpcServices="Server" Link="Protos\data.proto" />
 
     <None Include="..\..\..\examples\Certs\*.*" LinkBase="Certs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
 
     <Compile Include="..\Shared\BenchmarkConfigurationHelpers.cs" Link="BenchmarkConfigurationHelpers.cs" />
-    <Compile Include="..\Shared\Greeter.cs" Link="Greeter.cs" />
+    <Compile Include="..\Shared\GreetService.cs" Link="Services\GreetService.cs" />
+    <Compile Include="..\Shared\DataService.cs" Link="Services\DataService.cs" />
 
     <Content Update="hosting.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/perf/benchmarkapps/BenchmarkServer/Program.cs b/perf/benchmarkapps/BenchmarkServer/Program.cs
@@ -97,7 +97,10 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                             });
                         }
 
-                        listenOptions.Protocols = HttpProtocols.Http2;
+                        var httpProtocols = Enum.Parse<HttpProtocols>(context.Configuration["HttpProtocols"]);
+                        Console.WriteLine($"Protocol: {httpProtocols}");
+
+                        listenOptions.Protocols = httpProtocols;
                     });
                 });
 
diff --git a/perf/benchmarkapps/BenchmarkServer/Startup.cs b/perf/benchmarkapps/BenchmarkServer/Startup.cs
@@ -45,6 +45,14 @@ public void Configure(IApplicationBuilder app)
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapGrpcService<GreeterService>();
+                endpoints.MapGrpcService<DataService>();
+
+                endpoints.MapControllers();
+                
+                endpoints.MapGet("/", context =>
+                {
+                    return context.Response.WriteAsync("Benchmark Server");
+                });
 
                 endpoints.MapPost("/raw/greeter", async context =>
                 {
@@ -66,8 +74,6 @@ public void Configure(IApplicationBuilder app)
                     ms.Seek(0, SeekOrigin.Begin);
                     await ms.CopyToAsync(context.Response.Body);
                 });
-
-                endpoints.MapControllers();
             });
         }
     }
diff --git a/perf/benchmarkapps/BenchmarkServer/grpc-aspnetcore.json b/perf/benchmarkapps/BenchmarkServer/grpc-aspnetcore.json
@@ -12,9 +12,34 @@
     },
     "Port": 50051
   },
+
   "GrpcUnaryAspNetCore": {
     "ClientProperties": {
       "Scenario": "Unary"
     }
+  },
+
+  "GrpcUnaryAspNetCore-h2load": {
+    "Client": "h2load",
+    "Path": "/Greet.Greeter/SayHello",
+    "Headers": {
+      "content-type": "application/grpc"
+    },
+    "ClientProperties": {
+      "protocol": "h2c",
+      "RequestBody": "AAAAAAcKBVdvcmxk"
+    }
+  },
+
+  "GrpcJsonAspNetCore-h2load": {
+    "Client": "h2load",
+    "Path": "/greet/jsongreeter",
+    "Headers": {
+      "content-type": "application/json"
+    },
+    "ClientProperties": {
+      "protocol": "h2c",
+      "RequestBody": "eyJOYW1lIjoiV29ybGQifQ=="
+    }
   }
 }
diff --git a/perf/benchmarkapps/BenchmarkServer/hosting.json b/perf/benchmarkapps/BenchmarkServer/hosting.json
@@ -2,5 +2,6 @@
   "urls": "",
   "server.urls": "",
   "UseTls": "false", // Changing this will impact benchmarks run in ASP.NET perf lab
-  "RequireClientCertificate": "false"
+  "RequireClientCertificate": "false",
+  "HttpProtocols": "Http2"
 }
diff --git a/perf/benchmarkapps/NativeServer/NativeServer.csproj b/perf/benchmarkapps/NativeServer/NativeServer.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <Protobuf Include="..\Shared\greet.proto" GrpcServices="Server" Link="Protos\greet.proto" />
+    <Protobuf Include="..\Shared\data.proto" GrpcServices="Server" Link="Protos\data.proto" />
 
     <None Remove="hosting.json" />
     <Content Include="hosting.json">
@@ -15,7 +16,8 @@
     </Content>
 
     <Compile Include="..\Shared\BenchmarkConfigurationHelpers.cs" Link="BenchmarkConfigurationHelpers.cs" />
-    <Compile Include="..\Shared\Greeter.cs" Link="Greeter.cs" />
+    <Compile Include="..\Shared\GreetService.cs" Link="Services\GreetService.cs" />
+    <Compile Include="..\Shared\DataService.cs" Link="Services\DataService.cs" />
 
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
@@ -36,4 +38,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Grpc.Net.Common\Grpc.Net.Common.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/perf/benchmarkapps/NativeServer/Program.cs b/perf/benchmarkapps/NativeServer/Program.cs
@@ -45,7 +45,11 @@ public static void Main(string[] args)
 
             Server server = new Server
             {
-                Services = { Greet.Greeter.BindService(new GreeterService()) },
+                Services =
+                {
+                    Greet.GreetService.BindService(new GreeterService()),
+                    Data.DataService.BindService(new DataService())
+                },
                 Ports =
                 {
                     { host, endpoint.Port, UseCertificate ? GetCertificateCredentials() : ServerCredentials.Insecure }
diff --git a/perf/benchmarkapps/NativeServer/grpc-native.json b/perf/benchmarkapps/NativeServer/grpc-native.json
@@ -12,6 +12,19 @@
     },
     "Port": 50051
   },
+
+  "GrpcUnaryNative-h2load": {
+    "Client": "h2load",
+    "Path": "/Greet.Greeter/SayHello",
+    "Headers": {
+      "content-type": "application/grpc"
+    },
+    "ClientProperties": {
+      "protocol": "h2c",
+      "RequestBody": "AAAAAAcKBVdvcmxk"
+    }
+  },
+
   "GrpcUnaryNative": {
     "ClientProperties": {
       "Scenario": "Unary"
diff --git a/perf/benchmarkapps/Shared/DataService.cs b/perf/benchmarkapps/Shared/DataService.cs
@@ -0,0 +1,54 @@
+#region Copyright notice and license
+
+// Copyright 2019 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#endregion
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Data;
+using Google.Protobuf;
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+
+class DataService : Data.DataService.DataServiceBase
+{
+    public override async Task DuplexStream(IAsyncStreamReader<DataMessage> requestStream, IServerStreamWriter<DataMessage> responseStream, ServerCallContext context)
+    {
+        var messageSize = int.Parse(context.RequestHeaders.Single(h => h.Key == "data-size").Value);
+        var messageData = ByteString.CopyFrom(new byte[messageSize]);
+
+        var readTask = Task.Run(async () =>
+        {
+            await foreach (var message in requestStream.ReadAllAsync())
+            {
+                // Nom nom nom
+            }
+        });
+
+        // Write outgoing messages until canceled
+        while (context.CancellationToken.IsCancellationRequested)
+        {
+            await responseStream.WriteAsync(new DataMessage
+            {
+                Data = messageData,
+                Timestamp = Timestamp.FromDateTime(DateTime.UtcNow)
+            });
+        }
+
+        await readTask;
+    }
+}
diff --git a/perf/benchmarkapps/Shared/GreetService.cs b/perf/benchmarkapps/Shared/GreetService.cs
diff --git a/perf/benchmarkapps/Shared/data.proto b/perf/benchmarkapps/Shared/data.proto
diff --git a/perf/benchmarkapps/Shared/greet.proto b/perf/benchmarkapps/Shared/greet.proto

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace BenchmarkClient.Workers`
`27`	`27`	`public class GrpcCoreUnaryWorker : IWorker`
`28`	`28`	`{`
`29`	`29`	`private Channel? _channel;`
`30`		`- private Greeter.GreeterClient? _client;`
	`30`	`+ private GreetService.GreetServiceClient? _client;`
`31`	`31`	`private bool _useClientCertificate;`
`32`	`32`
`33`	`33`	`public GrpcCoreUnaryWorker(int id, string target, bool useClientCertificate)`
`@@ -53,7 +53,7 @@ public Task ConnectAsync()`
`53`	`53`	`: ChannelCredentials.Insecure;`
`54`	`54`
`55`	`55`	`_channel = new Channel(Target, credentials);`
`56`		`- _client = new Greeter.GreeterClient(_channel);`
	`56`	`+ _client = new GreetService.GreetServiceClient(_channel);`
`57`	`57`
`58`	`58`	`return _channel.ConnectAsync();`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,20 @@ namespace BenchmarkClient.Workers`
`27`	`27`	`{`
`28`	`28`	`public class GrpcHttpClientUnaryWorker : IWorker`
`29`	`29`	`{`
	`30`	`+ private readonly bool _useClientCertificate;`
`30`	`31`	`private readonly DateTime? _deadline;`
`31`		`- private Greeter.GreeterClient? _client;`
	`32`	`+ private GreetService.GreetServiceClient? _client;`
`32`	`33`
`33`		`- public GrpcHttpClientUnaryWorker(int id, string baseUri, DateTime? deadline = null)`
	`34`	`+ public GrpcHttpClientUnaryWorker(int id, string target, bool useClientCertificate, DateTime? deadline = null)`
`34`	`35`	`{`
`35`	`36`	`Id = id;`
`36`		`- BaseUri = baseUri;`
	`37`	`+ Target = target;`
	`38`	`+ _useClientCertificate = useClientCertificate;`
`37`	`39`	`_deadline = deadline;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public int Id { get; }`
`41`		`- public string BaseUri { get; }`
	`43`	`+ public string Target { get; }`
`42`	`44`
`43`	`45`	`public async Task CallAsync()`
`44`	`46`	`{`
`@@ -49,8 +51,11 @@ public async Task CallAsync()`
`49`	`51`
`50`	`52`	`public Task ConnectAsync()`
`51`	`53`	`{`
`52`		`- var channel = GrpcChannel.ForAddress(new Uri(BaseUri, UriKind.RelativeOrAbsolute));`
`53`		`- _client = new Greeter.GreeterClient(channel);`
	`54`	`+ var url = _useClientCertificate ? "https://" : "http://";`
	`55`	`+ url += Target;`
	`56`	`+`
	`57`	`+ var channel = GrpcChannel.ForAddress(new Uri(url, UriKind.RelativeOrAbsolute));`
	`58`	`+ _client = new GreetService.GreetServiceClient(channel);`
`54`	`59`
`55`	`60`	`return Task.CompletedTask;`
`56`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,14 @@ public void Configure(IApplicationBuilder app)`
`45`	`45`	`app.UseEndpoints(endpoints =>`
`46`	`46`	`{`
`47`	`47`	`endpoints.MapGrpcService<GreeterService>();`
	`48`	`+ endpoints.MapGrpcService<DataService>();`
	`49`	`+`
	`50`	`+ endpoints.MapControllers();`
	`51`	`+`
	`52`	`+ endpoints.MapGet("/", context =>`
	`53`	`+ {`
	`54`	`+ return context.Response.WriteAsync("Benchmark Server");`
	`55`	`+ });`
`48`	`56`
`49`	`57`	`endpoints.MapPost("/raw/greeter", async context =>`
`50`	`58`	`{`
`@@ -66,8 +74,6 @@ public void Configure(IApplicationBuilder app)`
`66`	`74`	`ms.Seek(0, SeekOrigin.Begin);`
`67`	`75`	`await ms.CopyToAsync(context.Response.Body);`
`68`	`76`	`});`
`69`		`-`
`70`		`- endpoints.MapControllers();`
`71`	`77`	`});`
`72`	`78`	`}`
`73`	`79`	`}`