Fixed how we parse the raw data since we added a small priming run to the tests

framework_test.py

@@ -15,12 +15,19 @@ class FrameworkTest:
     
     echo ""
     echo "---------------------------------------------------------"
-    echo " Running Warmup {name}"
-    echo " wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}"
+    echo " Running Primer {name}"
+    echo " wrk -r 1000 -c 8 -t 8 http://{server_host}:{port}{url}"
     echo "---------------------------------------------------------"
     echo ""
     wrk -r 1000 -c 8 -t 8 http://{server_host}:{port}{url}
     sleep 5
+    
+    echo ""
+    echo "---------------------------------------------------------"
+    echo " Running Warmup {name}"
+    echo " wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}"
+    echo "---------------------------------------------------------"
+    echo ""
     wrk -r {runs} -c {max_concurrency} -t {max_threads} http://{server_host}:{port}{url}
     sleep 5
     for c in {interval}
@@ -38,7 +45,16 @@ class FrameworkTest:
 
   query_template = """
     mysqladmin flush-hosts -uroot -psecret
-
+    
+    echo ""
+    echo "---------------------------------------------------------"
+    echo " Running Primer {name}"
+    echo " wrk -r 1000 -c 8 -t 8 http://{server_host}:{port}{url}2"
+    echo "---------------------------------------------------------"
+    echo ""
+    wrk -r 1000 -c 8 -t 8 http://{server_host}:{port}{url}2
+    sleep 5
+    
     echo ""
     echo "---------------------------------------------------------"
     echo " Running Warmup {name}"
@@ -224,19 +240,21 @@ class FrameworkTest:
       results['requests']['max'] = 0
       results['requests']['stdevPercent'] = 0
       with open(self.benchmarker.output_file(self.name, test_type)) as raw_data:
-        found_warmup = False
+        is_warmup = False
         for line in raw_data:
-          # wrk outputs a line with the "Requests/sec:" number for each run
-          if "Requests/sec:" in line:
-            # Every raw data file first has a warmup run, so we need to pass over that before we begin parsing
-            if not found_warmup:
-              found_warmup = True
-              continue
 
-            m = re.search("Requests/sec:\s+([0-9]+)", line)
-            results['results'].append(m.group(1))
+          if "Queries:" in line or "Concurrency:" in line:
+            is_warmup = False
+            continue
+          if "Warmup" in line or "Primer" in line:
+            is_warmup = True
+            continue
 
-          if found_warmup:
+          if not is_warmup:
+            if "Requests/sec:" in line:
+              m = re.search("Requests/sec:\s+([0-9]+)", line)
+              results['results'].append(m.group(1))
+              
             # search for weighttp data such as succeeded and failed.
             if "Latency" in line:
               m = re.findall("([0-9]+\.*[0-9]*[us|ms|s|m|%]+)", line)

results/ec2/20130404200504/db.csv

@@ -22,7 +22,7 @@ rails-jruby,591,601,591,578,569,541
 rails-ruby,545,500,468,460,459,453
 servlet-raw,4280,7902,8160,7916,7787,6588
 flask,532,525,521,539,538,538
-yesod,1199,1854,1265,1203,1187,1193,1188
+yesod,1854,1265,1203,1187,1193,1188
 http-kit,3662,3611,3507,3655,3668,3635
 rails-stripped-jruby,682,697,670,689,676,623
 rails-stripped-ruby,653,585,528,531,529,527

results/ec2/20130404200504/json.csv

@@ -19,13 +19,13 @@ php,3820,3941,3932,3885,3940,3943
 play,3714,3968,4145,4544,4831,4763
 rack-jruby,2735,4371,4573,4623,4621,4494
 rack-ruby,2353,2520,2354,1988,1981,1976
-rails-jruby,370,706,857,857,843,822,783
+rails-jruby,706,857,857,843,822,783
 rails-ruby,721,655,616,603,597,597
 django-stripped,1418,2228,1860,2286,2268,2245
 servlet,19195,24771,25511,26440,23692,19224
 flask,1590,1633,1702,1746,1751,1757
 netty,17475,30812,34093,37777,37929,37644
-yesod,2187,2693,2425,2358,2308,2265,2167
+yesod,2693,2425,2358,2308,2265,2167
 http-kit,9065,9604,10213,11779,12569,13599
 rails-stripped-jruby,808,1081,1075,1065,1053,1004
 rails-stripped-ruby,890,824,774,743,739,733