fix(perf-tests): Initial perf tests had artificially high P99 (#229)

fauna · Dec 12, 2024 · 71af118 · 71af118
1 parent f6142aa
commit 71af118
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 149 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Fauna.Test/Performance/utils"]
+	path = Fauna.Test/Performance/utils
+	url = https://github.com/fauna/driver-perf-utils.git
diff --git a/Fauna.Test/Fauna.Test.csproj b/Fauna.Test/Fauna.Test.csproj
@@ -18,13 +18,13 @@
     <PackageReference Include="Polly" Version="8.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Performance/setup/*">
+    <Content Include="Performance/utils/*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>setup/%(Filename)%(Extension)</Link>
+      <Link>utils/%(Filename)%(Extension)</Link>
     </Content>
-    <Content Include="Performance/setup/fauna/*">
+    <Content Include="Performance/utils/fauna/*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>setup/fauna/%(Filename)%(Extension)</Link>
+      <Link>utils/fauna/%(Filename)%(Extension)</Link>
     </Content>
   </ItemGroup>
   <ItemGroup>

diff --git a/Fauna.Test/Performance/Performance.Tests.cs b/Fauna.Test/Performance/Performance.Tests.cs
@@ -27,6 +27,9 @@ public void BeforeAll()
         var endpoint = Environment.GetEnvironmentVariable("FAUNA_ENDPOINT") ?? "http://localhost:8443";
 
         _client = GetTestClient(secret, endpoint, true);
+
+        // Make initial query to establish connection before running perf
+        var _ = _client.QueryAsync(FQL($"null")).Result;
     }
 
     [SetUp]

diff --git a/Fauna.Test/Performance/TestDataParser.cs b/Fauna.Test/Performance/TestDataParser.cs
@@ -50,7 +50,7 @@ internal static class TestDataParser
     /// <returns>An IEnumerable<TestCaseData> that iterates over test scenarios</returns>
     public static IEnumerable<TestCaseData> GetQueriesFromFile()
     {
-        var contents = File.ReadAllText("./setup/queries.json");
+        var contents = File.ReadAllText("./utils/queries.json");
         var jsonRoot = JsonSerializer.Deserialize<TestQueries>(contents);
 
         foreach (var query in jsonRoot!.Queries)

diff --git a/Fauna.Test/Performance/setup/fauna/main.fsl b/Fauna.Test/Performance/setup/fauna/main.fsl
diff --git a/Fauna.Test/Performance/setup/fauna/seeddata.fql b/Fauna.Test/Performance/setup/fauna/seeddata.fql
diff --git a/Fauna.Test/Performance/setup/init.sh b/Fauna.Test/Performance/setup/init.sh
diff --git a/Fauna.Test/Performance/setup/queries.json b/Fauna.Test/Performance/setup/queries.json
diff --git a/Fauna.Test/Performance/setup/teardown.sh b/Fauna.Test/Performance/setup/teardown.sh
diff --git a/Fauna.Test/Performance/utils b/Fauna.Test/Performance/utils
diff --git a/Fauna/Configuration.cs b/Fauna/Configuration.cs
@@ -1,5 +1,4 @@
-using System.Threading;
-using Fauna.Core;
+using Fauna.Core;
 using Fauna.Util;
 using Microsoft.Extensions.Logging;
 

diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
@@ -90,7 +90,7 @@ resources:
   - name: dev-tests-trigger
     type: time
     source:
-      interval: 6h
+      interval: 24h
 
 jobs:
   - name: set-self

diff --git a/concourse/scripts/perf.sh b/concourse/scripts/perf.sh
@@ -8,12 +8,12 @@ export LOG_UNIQUE=$(date +%s%3N)
 # Install fauna-shell
 apt update -qq
 apt install -y -qq npm
-npm install --silent -g fauna-shell@^2.0.0
+npm install --silent -g fauna-shell@^3.0.0
 
 cd repo.git
 
 # Run init.sh to setup database schema and initial data
-pushd Fauna.Test/Performance/setup
+pushd Fauna.Test/Performance/utils
 ./init.sh
 
 # Build solution and run performance tests
@@ -32,5 +32,5 @@ echo '```' >> ../slack-message/perf-stats
 echo "_<$CONCOURSE_URL|Concourse job>_" >> ../slack-message/perf-stats
 
 # Run teardown.sh to delete the test collections
-pushd Fauna.Test/Performance/setup
+pushd Fauna.Test/Performance/utils
 ./teardown.sh