Browse Source

Remove Red Hat Linux Transport benchmarks. (#6026)

There are no plans to maintain the Red Hat Linux transport for .NET 5 and later.
Tom Deseyn 4 years ago
parent
commit
a2b1a2178b

+ 8 - 23
frameworks/CSharp/aspnetcore-corert/PlatformBenchmarks/BenchmarkConfigurationHelpers.cs

@@ -16,36 +16,21 @@ namespace PlatformBenchmarks
         {
             builder.UseConfiguration(configuration);
 
-            // Handle the transport type
-            var webHost = builder.GetSetting("KestrelTransport");
-
-            Console.WriteLine($"Transport: {webHost}");
-
-            if (string.Equals(webHost, "LinuxTransport", StringComparison.OrdinalIgnoreCase))
-            {
-                builder.UseLinuxTransport(options =>
-                {
-                    options.ApplicationSchedulingMode = PipeScheduler.Inline;
-                });
-            }
-            else
+            builder.UseSockets(options =>
             {
-                builder.UseSockets(options =>
+                if (int.TryParse(builder.GetSetting("threadCount"), out int threadCount))
                 {
-                    if (int.TryParse(builder.GetSetting("threadCount"), out int threadCount))
-                    {
-                        options.IOQueueCount = threadCount;
-                    }
+                    options.IOQueueCount = threadCount;
+                }
 
 #if NETCOREAPP5_0 || NET5_0
-                    options.WaitForDataBeforeAllocatingBuffer = false;
+                options.WaitForDataBeforeAllocatingBuffer = false;
 
-                    Console.WriteLine($"Options: WaitForData={options.WaitForDataBeforeAllocatingBuffer}, IOQueue={options.IOQueueCount}");
+                Console.WriteLine($"Options: WaitForData={options.WaitForDataBeforeAllocatingBuffer}, IOQueue={options.IOQueueCount}");
 #endif
-                });
-            }
+            });
 
-                return builder;
+            return builder;
         }
 
         public static IPEndPoint CreateIPEndPoint(this IConfiguration config)

+ 0 - 1
frameworks/CSharp/aspnetcore-corert/PlatformBenchmarks/NuGet.Config

@@ -4,6 +4,5 @@
     <clear />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-    <add key="rh" value="https://www.myget.org/F/redhat-dotnet/api/v3/index.json" />
   </packageSources>
 </configuration>

+ 0 - 1
frameworks/CSharp/aspnetcore-corert/PlatformBenchmarks/PlatformBenchmarks.csproj

@@ -24,7 +24,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.2" />
-    <PackageReference Include="RedHat.AspNetCore.Server.Kestrel.Transport.Linux" Version="3.0.0-*" />
     <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-*" />
   </ItemGroup>
 </Project>

+ 0 - 3
frameworks/CSharp/aspnetcore-corert/PlatformBenchmarks/rd.xml

@@ -39,8 +39,5 @@
         <Assembly Name="Microsoft.Extensions.Configuration.Json">
             <Type Name="Microsoft.Extensions.Configuration.Json.JsonConfigurationSource" Dynamic="Required All" />
         </Assembly>
-        <Assembly Name="RedHat.AspNetCore.Server.Kestrel.Transport.Linux">
-            <Type Name="RedHat.AspNetCore.Server.Kestrel.Transport.Linux.LinuxTransportFactory" Dynamic="Required All" />
-        </Assembly>
     </Application>
 </Directives>

+ 0 - 12
frameworks/CSharp/aspnetcore-corert/aspcore-corert-rhtx.dockerfile

@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS build
-RUN apt-get update
-RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
-WORKDIR /app
-COPY PlatformBenchmarks .
-RUN dotnet publish -c Release -o out -r linux-x64
-
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.2 AS runtime
-WORKDIR /app
-COPY --from=build /app/out ./
-
-ENTRYPOINT ["./PlatformBenchmarks", "--server.urls=http://+:8080", "KestrelTransport=LinuxTransport"]

+ 0 - 19
frameworks/CSharp/aspnetcore-corert/benchmark_config.json

@@ -19,25 +19,6 @@
       "display_name": "ASP.NET Core",
       "notes": "",
       "versus": "aspcore"
-    },
-    "rhtx": {
-      "plaintext_url": "/plaintext",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "ASP.NET Core",
-      "language": "C#",
-      "orm": "Raw",
-      "platform": ".NET",
-      "flavor": "CoreRT",
-      "webserver": "Kestrel",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ASP.NET Core, Red Hat Linux Transport",
-      "notes": "",
-      "versus": "aspcore"
     }
   }]
 }

+ 7 - 22
frameworks/CSharp/aspnetcore/PlatformBenchmarks/BenchmarkConfigurationHelpers.cs

@@ -16,34 +16,19 @@ namespace PlatformBenchmarks
         {
             builder.UseConfiguration(configuration);
 
-            // Handle the transport type
-            var webHost = builder.GetSetting("KestrelTransport");
-
-            Console.WriteLine($"Transport: {webHost}");
-
-            if (string.Equals(webHost, "LinuxTransport", StringComparison.OrdinalIgnoreCase))
-            {
-                builder.UseLinuxTransport(options =>
-                {
-                    options.ApplicationSchedulingMode = PipeScheduler.Inline;
-                });
-            }
-            else
+            builder.UseSockets(options =>
             {
-                builder.UseSockets(options =>
+                if (int.TryParse(builder.GetSetting("threadCount"), out int threadCount))
                 {
-                    if (int.TryParse(builder.GetSetting("threadCount"), out int threadCount))
-                    {
-                        options.IOQueueCount = threadCount;
-                    }
+                    options.IOQueueCount = threadCount;
+                }
 
 #if NETCOREAPP5_0 || NET5_0
-                    options.WaitForDataBeforeAllocatingBuffer = false;
+                options.WaitForDataBeforeAllocatingBuffer = false;
 
-                    Console.WriteLine($"Options: WaitForData={options.WaitForDataBeforeAllocatingBuffer}, IOQueue={options.IOQueueCount}");
+                Console.WriteLine($"Options: WaitForData={options.WaitForDataBeforeAllocatingBuffer}, IOQueue={options.IOQueueCount}");
 #endif
-                });
-            }
+            });
 
             return builder;
         }

+ 0 - 1
frameworks/CSharp/aspnetcore/PlatformBenchmarks/NuGet.Config

@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-    <add key="rh" value="https://www.myget.org/F/redhat-dotnet/api/v3/index.json" />
   </packageSources>
 </configuration>

+ 0 - 1
frameworks/CSharp/aspnetcore/PlatformBenchmarks/PlatformBenchmarks.csproj

@@ -16,6 +16,5 @@
 
   <ItemGroup>
     <PackageReference Include="Npgsql" Version="5.0.0-alpha1" />
-    <PackageReference Include="RedHat.AspNetCore.Server.Kestrel.Transport.Linux" Version="3.0.0-*" />
   </ItemGroup>
 </Project>

+ 0 - 12
frameworks/CSharp/aspnetcore/aspcore-rhtx-pg-up.dockerfile

@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY PlatformBenchmarks .
-RUN dotnet publish -c Release -o out /p:IsDatabase=true
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-COPY PlatformBenchmarks/appsettings.postgresql.updates.json ./appsettings.json
-
-ENTRYPOINT ["dotnet", "PlatformBenchmarks.dll", "KestrelTransport=LinuxTransport"]

+ 0 - 12
frameworks/CSharp/aspnetcore/aspcore-rhtx-pg.dockerfile

@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY PlatformBenchmarks .
-RUN dotnet publish -c Release -o out /p:IsDatabase=true
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-COPY PlatformBenchmarks/appsettings.postgresql.json ./appsettings.json
-
-ENTRYPOINT ["dotnet", "PlatformBenchmarks.dll", "KestrelTransport=LinuxTransport"]

+ 0 - 12
frameworks/CSharp/aspnetcore/aspcore-rhtx.dockerfile

@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY PlatformBenchmarks .
-RUN dotnet publish -c Release -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-COPY Benchmarks/appsettings.json ./appsettings.json
-
-ENTRYPOINT ["dotnet", "PlatformBenchmarks.dll", "KestrelTransport=LinuxTransport"]

+ 0 - 58
frameworks/CSharp/aspnetcore/benchmark_config.json

@@ -20,25 +20,6 @@
       "notes": "",
       "versus": "aspcore"
     },
-    "rhtx": {
-      "plaintext_url": "/plaintext",
-      "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "ASP.NET Core",
-      "language": "C#",
-      "orm": "Raw",
-      "platform": ".NET",
-      "flavor": "CoreCLR",
-      "webserver": "Kestrel",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ASP.NET Core, Red Hat Linux Transport",
-      "notes": "",
-      "versus": "aspcore"
-    },
     "pgo": {
       "plaintext_url": "/plaintext",
       "json_url": "/json",
@@ -136,45 +117,6 @@
       "notes": "",
       "versus": "aspcore-ado-pg-up"
     },
-    "rhtx-pg": {
-      "fortune_url": "/fortunes",
-      "db_url": "/db",
-      "query_url": "/queries/",
-      "cached_query_url": "/cached-worlds/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "ASP.NET Core",
-      "language": "C#",
-      "orm": "Raw",
-      "platform": ".NET",
-      "flavor": "CoreCLR",
-      "webserver": "Kestrel",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ASP.NET Core, Red Hat Linux Transport, ADO.NET",
-      "notes": "",
-      "versus": "aspcore-ado-pg"
-    },
-    "rhtx-pg-up": {
-      "update_url": "/updates/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "Postgres",
-      "framework": "ASP.NET Core",
-      "language": "C#",
-      "orm": "Raw",
-      "platform": ".NET",
-      "flavor": "CoreCLR",
-      "webserver": "Kestrel",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ASP.NET Core, Red Hat Linux Transport, ADO.NET",
-      "notes": "",
-      "versus": "aspcore-ado-pg-up"
-    },
     "mw": {
       "plaintext_url": "/plaintext",
       "port": 8080,

+ 0 - 20
frameworks/FSharp/falco/benchmark_config.json

@@ -21,26 +21,6 @@
         "display_name": "Falco, Donald",
         "notes": "",
         "versus": "aspcore"
-      },
-      "rhtx": {
-        "plaintext_url": "/plaintext",
-        "json_url": "/json",
-        "fortune_url": "/fortunes",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "Falco",
-        "language": "F#",
-        "orm": "micro",
-        "platform": ".NET",
-        "flavor": "CoreCLR",
-        "webserver": "Kestrel",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "Falco, Donald, Red Hat Linux Transport",
-        "notes": "",
-        "versus": "aspcore"
       }
     }
   ]

+ 0 - 11
frameworks/FSharp/falco/falco-rhtx.dockerfile

@@ -1,11 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY src/App .
-RUN dotnet publish -c Release -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-
-ENTRYPOINT ["dotnet", "App.dll", "KestrelTransport=LinuxTransport"]

+ 0 - 20
frameworks/FSharp/frank/benchmark_config.json

@@ -21,26 +21,6 @@
         "display_name": "Frank, Dapper",
         "notes": "",
         "versus": "aspcore"
-      },
-      "rhtx": {
-        "plaintext_url": "/plaintext",
-        "json_url": "/json",
-        "fortune_url": "/fortunes",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "Frank",
-        "language": "F#",
-        "orm": "micro",
-        "platform": ".NET",
-        "flavor": "CoreCLR",
-        "webserver": "Kestrel",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "Frank, Dapper, Red Hat Linux Transport",
-        "notes": "",
-        "versus": "aspcore"
       }
     }
   ]

+ 0 - 11
frameworks/FSharp/frank/frank-rhtx.dockerfile

@@ -1,11 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /app
-COPY src/App .
-RUN dotnet publish -c Release -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
-ENV ASPNETCORE_URLS http://+:8080
-WORKDIR /app
-COPY --from=build /app/out ./
-
-ENTRYPOINT ["dotnet", "App.dll", "KestrelTransport=LinuxTransport"]