fix(perf) typo and better intermediate error handling (Kong#7177)

fffonion · web-flow · commit 1836a36d25d8 · 2021-05-24T21:11:01.000+08:00
diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
@@ -76,7 +76,7 @@ jobs:
           if [[ -z $tags ]]; then
             tags="simple"
           fi
-        elif [[ $suite == "/flamegraph" ]]; then
+        elif [[ $suite == "/perf" ]]; then
           suites="01-rps"
           if [[ -z $tags ]]; then
             tags="baseline,single_route"
diff --git a/spec/helpers/perf.lua b/spec/helpers/perf.lua
@@ -218,8 +218,7 @@ function _M.start_stapxx(sample_name, ...)
 end
 
 --- Wait the load test to finish and get result
--- @function start_load
--- @param opts.path string request path
+-- @function wait_result
 -- @return string the test report text
 function _M.wait_result(opts)
   if not load_thread then
@@ -282,14 +281,16 @@ local function sum(t)
 end
 
 -- Note: could also use custom lua code in wrk
+local nan = 0/0
 local function parse_wrk_result(r)
   local rps = string.match(r, "Requests/sec:%s+([%d%.]+)")
   rps = tonumber(rps)
   local count = string.match(r, "([%d]+)%s+requests in")
   count = tonumber(count)
+  -- Note: doesn't include case where unit is us: Latency     0.00us    0.00us   0.00us    -nan%
   local lat_avg, avg_m, lat_max, max_m = string.match(r, "Latency%s+([%d%.]+)(m?)s%s+[%d%.]+m?s%s+([%d%.]+)(m?)s")
-  lat_avg = tonumber(lat_avg) * (avg_m == "m" and 1 or 1000)
-  lat_max = tonumber(lat_max) * (max_m == "m" and 1 or 1000)
+  lat_avg = tonumber(lat_avg or nan) * (avg_m == "m" and 1 or 1000)
+  lat_max = tonumber(lat_max or nan) * (max_m == "m" and 1 or 1000)
   return rps, count, lat_avg, lat_max
 end
 
diff --git a/spec/helpers/perf/drivers/terraform.lua b/spec/helpers/perf/drivers/terraform.lua
@@ -131,8 +131,8 @@ function _M:setup(opts)
   -- self.log.debug("(In a low voice) pg_password is " .. PG_PASSWORD)
 
   self.log.info("Infra is up! However, executing psql remotely may take a while...")
-  package.loaded["spec.helpers"] = nil
-  for i=1, 3 do 
+  for i=1, 3 do
+    package.loaded["spec.helpers"] = nil
     local pok, pret = pcall(require, "spec.helpers")
     if pok then
       return pret
