Parse out results from wrk raw data

benchmarker.py

@@ -175,7 +175,7 @@ class Benchmarker:
   ############################################################
   # report_results
   ############################################################
-  def report_results(self, framework, test, results, success, failed, errored, response_2xx, response_3xx, response_4xx, response_5xx, total_time):
+  def report_results(self, framework, test, results, latency, requests, total_time):
     # Try to get the id in the result array if it exists.
     try:
       framework_id = str(self.results['frameworks'].index(framework.name))
@@ -185,13 +185,8 @@ class Benchmarker:
     
     self.results['rawData'][test][framework_id] = results
     self.results['weighttpData'][test][framework_id] = dict()
-    self.results['weighttpData'][test][framework_id]['success'] = success
-    self.results['weighttpData'][test][framework_id]['failed'] = failed
-    self.results['weighttpData'][test][framework_id]['errored'] = errored
-    self.results['weighttpData'][test][framework_id]['2xx'] = response_2xx
-    self.results['weighttpData'][test][framework_id]['3xx'] = response_3xx
-    self.results['weighttpData'][test][framework_id]['4xx'] = response_4xx
-    self.results['weighttpData'][test][framework_id]['5xx'] = response_5xx
+    self.results['weighttpData'][test][framework_id]['latency'] = latency
+    self.results['weighttpData'][test][framework_id]['requests'] = requests
     self.results['weighttpData'][test][framework_id]['totalTime'] = total_time
 
   ############################################################

framework_test.py

@@ -136,9 +136,8 @@ class FrameworkTest:
         remote_script = self.__generate_concurrency_script(self.json_url, self.port)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'json'))
         results = self.__parse_test('json')
-        self.benchmarker.report_results(framework=self, test="json", success=results['succeeded'], 
-          failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-          response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+        self.benchmarker.report_results(framework=self, test="json", requests=results['requests'], latency=results['latency'],
+          results=results['results'], total_time=results['total_time'])
 
         print "Complete"
     except AttributeError:
@@ -151,9 +150,8 @@ class FrameworkTest:
         remote_script = self.__generate_concurrency_script(self.db_url, self.port)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'db'))
         results = self.__parse_test('db')
-        self.benchmarker.report_results(framework=self, test="db", success=results['succeeded'], 
-          failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-          response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+        self.benchmarker.report_results(framework=self, test="db", requests=results['requests'], latency=results['latency'],
+          results=results['results'], total_time=results['total_time'])
 
         print "Complete"
     except AttributeError:
@@ -166,9 +164,8 @@ class FrameworkTest:
         remote_script = self.__generate_query_script(self.query_url, self.port)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, 'query'))
         results = self.__parse_test('query')
-        self.benchmarker.report_results(framework=self, test="query", success=results['succeeded'], 
-          failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-          response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+        self.benchmarker.report_results(framework=self, test="query", requests=results['requests'], latency=results['latency'],
+          results=results['results'], total_time=results['total_time'])
         print "Complete"
     except AttributeError:
       pass
@@ -184,23 +181,20 @@ class FrameworkTest:
     # JSON
     if os.path.exists(self.benchmarker.output_file(self.name, 'json')):
       results = self.__parse_test('json')
-      self.benchmarker.report_results(framework=self, test="json", success=results['succeeded'], 
-        failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-        response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+      self.benchmarker.report_results(framework=self, test="json", requests=results['requests'], latency=results['latency'],
+        results=results['results'], total_time=results['total_time'])
     
     # DB
     if os.path.exists(self.benchmarker.output_file(self.name, 'db')):
       results = self.__parse_test('db')
-      self.benchmarker.report_results(framework=self, test="db", success=results['succeeded'], 
-        failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-        response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+      self.benchmarker.report_results(framework=self, test="db", requests=results['requests'], latency=results['latency'],
+        results=results['results'], total_time=results['total_time'])
     
     # Query
     if os.path.exists(self.benchmarker.output_file(self.name, 'query')):
       results = self.__parse_test('query')
-      self.benchmarker.report_results(framework=self, test="query", success=results['succeeded'], 
-        failed=results['failed'], errored=results['errored'], response_2xx=results['2xx'], response_3xx=results['3xx'], 
-        response_4xx=results['4xx'], response_5xx=results['5xx'], results=results['results'], total_time=results['total_time'])
+      self.benchmarker.report_results(framework=self, test="query", requests=results['requests'], latency=results['latency'],
+        results=results['results'], total_time=results['total_time'])
   ############################################################
   # End parse_all
   ############################################################
@@ -213,6 +207,16 @@ class FrameworkTest:
       results = dict()
       results['results'] = []
       results['total_time'] = 0
+      results['latency'] = dict()
+      results['latency']['avg'] = 0
+      results['latency']['stdev'] = 0
+      results['latency']['max'] = 0
+      results['latency']['stdevPercent'] = 0
+      results['requests'] = dict()
+      results['requests']['avg'] = 0
+      results['requests']['stdev'] = 0
+      results['requests']['max'] = 0
+      results['requests']['stdevPercent'] = 0
       with open(self.benchmarker.output_file(self.name, test_type)) as raw_data:
         found_warmup = False
         for line in raw_data:
@@ -223,39 +227,38 @@ class FrameworkTest:
               found_warmup = True
               continue
 
-            m = re.search("Requests/sec: ([0-9]+)", line)
+            m = re.search("Requests/sec:\s+([0-9]+)", line)
             results['results'].append(m.group(1))
 
           if found_warmup:
             # search for weighttp data such as succeeded and failed.
-            if "succeeded" in line:
-              m = re.search("([0-9]+) succeeded", line)
-              if m != None: results['succeeded'] = m.group(1)
-            if "failed" in line:
-              m = re.search("([0-9]+) failed", line)
-              if m != None: results['failed'] = m.group(1)
-            if "errored" in line:
-              m = re.search("([0-9]+) errored", line)
-              if m != None: results['errored'] = m.group(1)
-            if "2xx" in line:
-              m = re.search("([0-9]+) 2xx", line)
-              if m != None: results['2xx'] = m.group(1)
-            if "3xx" in line:
-              m = re.search("([0-9]+) 3xx", line)
-              if m != None: results['3xx'] = m.group(1)
-            if "4xx" in line:
-              m = re.search("([0-9]+) 4xx", line)
-              if m != None: results['4xx'] = m.group(1)
-            if "5xx" in line:
-              m = re.search("([0-9]+) 5xx", line)
-              if m != None: results['5xx'] = m.group(1)
-            if "sec," in line:
-              m = re.search("([0-9]+) sec,", line)
-              if m != None: results['total_time'] += int(m.group(1))
-            if "millisec" in line:
-              m = re.search("([0-9]+) millisec", line)
-              if m != None: results['total_time'] += ( float(m.group(1)) / 1000.0 )
+            if "Latency" in line:
+              m = re.findall("([0-9]+\.*[0-9]*[us|ms|s|m|%]+)", line)
+              if len(m) == 4:
+                results['latency']['avg'] = m[0]
+                results['latency']['stdev'] = m[1]
+                results['latency']['max'] = m[2]
+                results['latency']['stdevPercent'] = m[3]
             
+            if "Req/Sec" in line:
+              m = re.findall("([0-9]+\.*[0-9]*[us|ms|s|m|%]+)", line)
+              if len(m) == 4:
+                results['requests']['avg'] = m[0]
+                results['requests']['stdev'] = m[1]
+                results['requests']['max'] = m[2]
+                results['requests']['stdevPercent'] = m[3]
+              
+            if "requests in," in line:
+              m = re.search("requests in ([0-9]+\.*[0-9]*[s|m|h]+) ,", line)
+              if m != None: 
+                # parse out the raw time, which may be in minutes or seconds
+                raw_time = m.group(1)
+                if "s" in raw_time:
+                  results['total_time'] += float(raw_time[:1])
+                else if "m" in raw_time:
+                  results['total_time'] += float(raw_time[:1]) * 60.0
+                else if "h" in raw_time:
+                  results['total_time'] += float(raw_time[:1]) * 3600.0
 
       return results
     except IOError: