Revert "Tune maximum connection pool size for Npgsql, enable multiple…

…xing for non-platform benchmarks (aspnet#1667)" This reverts commit d72cf79.
roji · May 5, 2021 · f497f5b · f497f5b
1 parent fcac6a1
commit f497f5b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/scenarios/database.benchmarks.yml b/scenarios/database.benchmarks.yml
@@ -24,7 +24,7 @@ jobs:
     arguments: "--nonInteractive true --scenarios {{scenario}} --urls {{serverScheme}}://{{serverAddress}}:{{serverPort}} --server {{server}} --kestrelTransport {{transport}} --protocol {{protocol}}"
     environmentVariables:
       database: PostgresQL
-      connectionString: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=18;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Delay Us=500;Write Coalescing Buffer Threshold Bytes=1000
+      connectionString: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4
 
   postgresql:
     source:

diff --git a/scenarios/platform.benchmarks.yml b/scenarios/platform.benchmarks.yml
@@ -16,10 +16,7 @@ jobs:
       project: src/BenchmarksApps/Kestrel/PlatformBenchmarks/PlatformBenchmarks.csproj
     readyStateText: Application started.
     framework: net5.0
-    environmentVariables:
-      database: PostgreSQL
-      connectionstring: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=18;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Delay Us=500;Write Coalescing Buffer Threshold Bytes=1000
-
+
   postgresql:
     source:
       repository: https://github.com/TechEmpower/FrameworkBenchmarks.git
@@ -59,6 +56,9 @@ scenarios:
       job: platformbenchmarks
       buildArguments: 
         - "/p:IsDatabase=true"
+      environmentVariables:
+        database: PostgreSQL
+        connectionstring: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Delay Us=500;Write Coalescing Buffer Threshold Bytes=1000
     load:
       job: wrk
       variables:
@@ -73,6 +73,9 @@ scenarios:
       job: platformbenchmarks
       buildArguments: 
         - "/p:IsDatabase=true"
+      environmentVariables:
+        database: PostgreSQL
+        connectionstring: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;Enlist=false;Max Auto Prepare=4;Multiplexing=true;Write Coalescing Delay Us=500;Write Coalescing Buffer Threshold Bytes=1000
     load:
       job: wrk
       variables:
@@ -86,6 +89,9 @@ scenarios:
       job: platformbenchmarks
       buildArguments: 
         - "/p:IsDatabase=true"
+      environmentVariables:
+        database: PostgreSQL
+        connectionstring: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4
     load:
       job: wrk
       variables:
@@ -99,6 +105,9 @@ scenarios:
       job: platformbenchmarks
       buildArguments: 
         - "/p:IsDatabase=true"
+      environmentVariables:
+        database: PostgreSQL
+        connectionstring: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4
     load:
       job: wrk
       variables:
@@ -112,6 +121,9 @@ scenarios:
       job: platformbenchmarks
       buildArguments: 
         - "/p:IsDatabase=true"
+      environmentVariables:
+        database: PostgreSQL
+        connectionString: Server={{databaseServer}};Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=256;NoResetOnClose=true;Enlist=false;Max Auto Prepare=4
     load:
       job: wrk
       variables:

diff --git a/src/Benchmarks/Startup.cs b/src/Benchmarks/Startup.cs
@@ -72,8 +72,8 @@ public void ConfigureServices(IServiceCollection services)
                 case DatabaseServer.PostgreSql:
                     services.AddEntityFrameworkNpgsql();
                     var settings = new NpgsqlConnectionStringBuilder(appSettings.ConnectionString);
-                    if (!settings.NoResetOnClose && !settings.Multiplexing)
-                        throw new ArgumentException("No Reset On Close=true Or Multiplexing=true implies must be specified for Npgsql");
+                    if (!settings.NoResetOnClose)
+                        throw new ArgumentException("No Reset On Close=true must be specified for Npgsql");
                     if (settings.Enlist)
                         throw new ArgumentException("Enlist=false must be specified for Npgsql");