Merge branch 'luaMemoryLimits' of https://github.com/microsoft/garnet …

…into luaMemoryLimits
microsoft · Jan 15, 2025 · 2a49c6d · 2a49c6d
2 parents 4c5a2e9 + 3bc1deb
commit 2a49c6d
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 6 deletions.
diff --git a/.github/workflows/ci-bdnbenchmark.yml b/.github/workflows/ci-bdnbenchmark.yml
@@ -42,7 +42,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest ]
         framework: [ 'net8.0' ]
         configuration: [ 'Release' ]
-        test: [ 'Operations.BasicOperations', 'Operations.ObjectOperations', 'Operations.HashObjectOperations', 'Cluster.ClusterMigrate', 'Cluster.ClusterOperations', 'Lua.LuaScripts', 'Operations.CustomOperations', 'Operations.RawStringOperations', 'Operations.ScriptOperations','Network.BasicOperations', 'Network.RawStringOperations' ]
+        test: [ 'Operations.BasicOperations', 'Operations.ObjectOperations', 'Operations.HashObjectOperations', 'Cluster.ClusterMigrate', 'Cluster.ClusterOperations', 'Lua.LuaScripts', 'Lua.LuaScriptCacheOperations','Lua.LuaRunnerOperations','Operations.CustomOperations', 'Operations.RawStringOperations', 'Operations.ScriptOperations','Network.BasicOperations', 'Network.RawStringOperations' ]
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/test/BDNPerfTests/BDN_Benchmark_Config.json b/test/BDNPerfTests/BDN_Benchmark_Config.json
@@ -85,10 +85,90 @@
     "expected_MSet_None": 0
   },
   "BDN.benchmark.Lua.LuaScripts.*": {
-    "expected_Script1_None": 0,
-    "expected_Script2_None": 24,
-    "expected_Script3_None": 32,
-    "expected_Script4_None": 0
+    "expected_Script1_Managed,Limit": 0,
+    "expected_Script2_Managed,Limit": 24,
+    "expected_Script3_Managed,Limit": 32,
+    "expected_Script4_Managed,Limit": 0,
+    "expected_Script1_Managed,None": 0,
+    "expected_Script2_Managed,None": 24,
+    "expected_Script3_Managed,None": 32,
+    "expected_Script4_Managed,None": 0,
+    "expected_Script1_Native,None": 0,
+    "expected_Script2_Native,None": 24,
+    "expected_Script3_Native,None": 32,
+    "expected_Script4_Native,None": 0,
+    "expected_Script1_Tracked,Limit": 0,
+    "expected_Script2_Tracked,Limit": 24,
+    "expected_Script3_Tracked,Limit": 32,
+    "expected_Script4_Tracked,Limit": 0,
+    "expected_Script1_Tracked,None": 0,
+    "expected_Script2_Tracked,None": 24,
+    "expected_Script3_Tracked,None": 32,
+    "expected_Script4_Tracked,None": 0
+  },
+  "BDN.benchmark.Lua.LuaRunnerOperations.*": {
+    "expected_ResetParametersSmall_Managed,Limit": 0,
+    "expected_ResetParametersLarge_Managed,Limit": 0,
+    "expected_ConstructSmall_Managed,Limit": 2097602,
+    "expected_ConstructLarge_Managed,Limit": 2100666,
+    "expected_CompileForSessionSmall_Managed,Limit": 99,
+    "expected_CompileForSessionLarge_Managed,Limit": 0,
+    "expected_ResetParametersSmall_Managed,None": 0,
+    "expected_ResetParametersLarge_Managed,None": 0,
+    "expected_ConstructSmall_Managed,None": 2097674,
+    "expected_ConstructLarge_Managed,None": 2100738,
+    "expected_CompileForSessionSmall_Managed,None": 512,
+    "expected_CompileForSessionLarge_Managed,None": 0,
+    "expected_ResetParametersSmall_Native,None": 0,
+    "expected_ResetParametersLarge_Native,None": 0,
+    "expected_ConstructSmall_Native,None": 328,
+    "expected_ConstructLarge_Native,None": 3392,
+    "expected_CompileForSessionSmall_Native,None": 0,
+    "expected_CompileForSessionLarge_Native,None": 0,
+    "expected_ResetParametersSmall_Tracked,Limit": 0,
+    "expected_ResetParametersLarge_Tracked,Limit": 0,
+    "expected_ConstructSmall_Tracked,Limit": 402,
+    "expected_ConstructLarge_Tracked,Limit": 3465,
+    "expected_CompileForSessionSmall_Tracked,Limit": 0,
+    "expected_CompileForSessionLarge_Tracked,Limit": 0,
+    "expected_ResetParametersSmall_Tracked,None": 0,
+    "expected_ResetParametersLarge_Tracked,None": 0,
+    "expected_ConstructSmall_Tracked,None": 362,
+    "expected_ConstructLarge_Tracked,None": 3425,
+    "expected_CompileForSessionSmall_Tracked,None": 0,
+    "expected_CompileForSessionLarge_Tracked,None": 0
+  },
+  "BDN.benchmark.Lua.LuaScriptCacheOperations.*": {
+    "expected_LookupHit_Managed,Limit": 1312,
+    "expected_LookupMiss_Managed,Limit": 688,
+    "expected_LoadOuterHit_Managed,Limit": 688,
+    "expected_LoadInnerHit_Managed,Limit": 2098272,
+    "expected_LoadMiss_Managed,Limit": 1312,
+    "expected_Digest_Managed,Limit": 1312,
+    "expected_LookupHit_Managed,None": 688,
+    "expected_LookupMiss_Managed,None": 1312,
+    "expected_LoadOuterHit_Managed,None": 688,
+    "expected_LoadInnerHit_Managed,None": 2097760,
+    "expected_LoadMiss_Managed,None": 1312,
+    "expected_Digest_Managed,None": 688,
+    "expected_LookupHit_Native,None": 1312,
+    "expected_LookupMiss_Native,None": 1312,
+    "expected_LoadOuterHit_Native,None": 688,
+    "expected_LoadInnerHit_Native,None": 1040,
+    "expected_LoadMiss_Native,None": 1312,
+    "expected_Digest_Native,None": 688,
+    "expected_LookupHit_Tracked,Limit": 688,
+    "expected_LookupMiss_Tracked,Limit": 1312,
+    "expected_LoadOuterHit_Tracked,Limit": 688,
+    "expected_LoadInnerHit_Tracked,Limit": 1072,
+    "expected_LoadMiss_Tracked,Limit": 1264,
+    "expected_Digest_Tracked,Limit": 1312,
+    "expected_LookupHit_Tracked,None": 688,
+    "expected_LookupMiss_Tracked,None": 1312,
+    "expected_LoadOuterHit_Tracked,None": 1312,
+    "expected_LoadInnerHit_Tracked,None": 1696,
+    "expected_LoadMiss_Tracked,None": 1312,
+    "expected_Digest_Tracked,None": 1312
   },
   "BDN.benchmark.Operations.CustomOperations.*": {
     "expected_CustomRawStringCommand_ACL": 0,
@@ -159,7 +239,7 @@
     "expected_Eval_None": 0,
     "expected_EvalSha_None": 0,
     "expected_SmallScript_None": 0,
-    "expected_LargeScript_None": 12,
+    "expected_LargeScript_None": 23,
     "expected_ArrayReturn_None": 0
   },
   "BDN.benchmark.Network.RawStringOperations.*": {

diff --git a/test/BDNPerfTests/run_bdnperftest.ps1 b/test/BDNPerfTests/run_bdnperftest.ps1
@@ -73,6 +73,11 @@ param ($ResultsLine, $columnNum)
     $columns = $ResultsLine.Trim('|').Split('|')
     $column = $columns | ForEach-Object { $_.Trim() }
     $foundValue = $column[$columnNum]
+    if ($foundValue -eq "NA") {
+        Write-Error -Message "The value for the column was NA which means that the BDN test failed and didn't generate performance metrics. Verify the BDN test ran successfully."
+        exit
+    }
+
     if ($foundValue -eq "-") {
         $foundValue = "0"
     }