commit 7248c7bbbb4da6eb48618f2ca6091e4346fe4d15
author koder aka kdanilov <kdanilov@mirantis.com> Sun May 31 22:53:03 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Tue Jun 02 08:58:44 2015 +0300
tree c9d88301b510b3dc0c5ca0723e59024b4e8c2ec7
parent 4186f35739aad16c343ca7e937396eb867bcb47c

add mixed load test, other fixes

wally/suits/io/defaults.cfg

diff --git a/wally/suits/io/defaults.cfg b/wally/suits/io/defaults.cfg
index 9aff22c..8c8644b 100644
--- a/wally/suits/io/defaults.cfg
+++ b/wally/suits/io/defaults.cfg
@@ -1,6 +1,7 @@
 buffered=0
 group_reporting=1
 iodepth=1
+unified_rw_reporting=1
 
 norandommap=1
 

wally/suits/io/fio_task_parser.py

diff --git a/wally/suits/io/fio_task_parser.py b/wally/suits/io/fio_task_parser.py
index aca0254..ade0028 100644
--- a/wally/suits/io/fio_task_parser.py
+++ b/wally/suits/io/fio_task_parser.py
@@ -270,7 +270,7 @@
         'x': 'sync direct'
     }
     off_mode = {'s': 'sequential', 'r': 'random'}
-    oper = {'r': 'read', 'w': 'write'}
+    oper = {'r': 'read', 'w': 'write', 'm': 'mixed'}
     return smode[name[2]] + " " + \
         off_mode[name[0]] + " " + oper[name[1]]
 
@@ -322,7 +322,10 @@
     rw = {"randread": "rr",
           "randwrite": "rw",
           "read": "sr",
-          "write": "sw"}[sec.vals["rw"]]
+          "write": "sw",
+          "randrw": "rm",
+          "rw": "sm",
+          "readwrite": "sm"}[sec.vals["rw"]]
 
     sync_mode = get_test_sync_mode(sec)
     th_count = sec.vals.get('numjobs')

wally/suits/io/mixed_hdd.cfg

diff --git a/wally/suits/io/mixed_hdd.cfg b/wally/suits/io/mixed_hdd.cfg
new file mode 100644
index 0000000..be8b1ab
--- /dev/null
+++ b/wally/suits/io/mixed_hdd.cfg
@@ -0,0 +1,12 @@
+[global]
+include defaults.cfg
+ramp_time=5
+runtime=30
+blocksize=4k
+rw=randrw
+sync=1
+direct=1
+
+[mixed-hdd-r{rwmixread}_{TEST_SUMM}]
+rwmixread={% 0,20,40,60,80,100 %}
+numjobs={% 1,8,16 %}

wally/suits/io/mixed_ssd.cfg

diff --git a/wally/suits/io/mixed_ssd.cfg b/wally/suits/io/mixed_ssd.cfg
new file mode 100644
index 0000000..2e9f04c
--- /dev/null
+++ b/wally/suits/io/mixed_ssd.cfg
@@ -0,0 +1,12 @@
+[global]
+include defaults.cfg
+ramp_time=5
+runtime=30
+blocksize=4k
+rw=randrw
+sync=1
+direct=1
+
+[mixed-ssd-r{rwmixread}_{TEST_SUMM}]
+rwmixread={% 0,20,40,60,80,85,90,95,100 %}
+numjobs={% 1,16,64,128 %}