commit ce5444fbe4582364658860ce17c79fc47b931f06
author koder aka kdanilov <kdanilov@mirantis.com> Sat Mar 14 09:19:02 2015 +0200
committer koder aka kdanilov <kdanilov@mirantis.com> Sat Mar 14 09:19:08 2015 +0200
tree e50ad15c319fe49983351c88793b71e619d69322
parent dee7ec4687977148b9ad37e4ea5e95fd14ceecc3

update reporing tool

scripts/data.py

diff --git a/scripts/data.py b/scripts/data.py
index 7424711..2725a26 100644
--- a/scripts/data.py
+++ b/scripts/data.py
@@ -2,7 +2,7 @@
 import sys
 import json
 
-from disk_perf_test_tool.utils import kb_to_ssize
+from disk_perf_test_tool.utils import kb_to_ssize, ssize_to_kb
 
 splitter_rr = "(?ms)=====+\n"
 
@@ -116,7 +116,7 @@
 
 
 def show_data(*pathes):
-    begin = "|  {:>10}  {:>6}  {:>5} {:>3} {:>5} {:>7}"
+    begin = "|  {:>10}  {:>6}  {:>5} {:>3} {:>5} {:>7} {:>7}"
     first_file_templ = "  |  {:>6} ~ {:>5} {:>2}% {:>5} {:>6}"
     other_file_templ = first_file_templ + " ----  {:>6}%"
 
@@ -125,7 +125,7 @@
 
     header_ln = line_templ.replace("<", "^").replace(">", "^")
 
-    params = ["Oper", "Sync", "BSZ", "CC", "DSIZE", "OSIZE",
+    params = ["Oper", "Sync", "BSZ", "CC", "DSIZE", "OSIZE", "XSIZE",
               "BW1", "DEV1", "%", "IOPS1", "TIME"]
     for pos in range(1, len(pathes)):
         params += "BW{0}+DEV{0}+%+IOPS{0}+DIFF %+TTIME".format(pos).split("+")
@@ -157,6 +157,8 @@
         tp = k.rsplit(" ", 3)[0]
         op, s, sz, conc, fsize = k.split(" ")
 
+        xsize = int(ssize_to_kb(fsize) / ssize_to_kb(sz)) / int(conc)
+
         s = {'a': 'async', "s": "sync", "d": "direct"}[s]
 
         if tp != prev_tp and prev_tp is not None:
@@ -174,7 +176,7 @@
         perc0 = int(d0 * 100.0 / m0 + 0.5)
 
         data = [op, s, sz, conc, fsize,
-                metas[0][k]['orig_size'],
+                metas[0][k]['orig_size'], xsize,
                 m0, d0, perc0, iops0,
                 to_min_sec(metas[0][k]['times'])]
 

scripts/generate_load.py

diff --git a/scripts/generate_load.py b/scripts/generate_load.py
index 4d43964..f99c816 100644
--- a/scripts/generate_load.py
+++ b/scripts/generate_load.py
@@ -19,6 +19,10 @@
 HDD_SIZE_KB = 45 * 1000 * 1000
 
 
+def max_file():
+    pass
+
+
 def make_load(sizes, opers, sync_types, concurrence,
               tester_type='iozone', repeat_count=3):
 
@@ -59,7 +63,10 @@
                         size_sync_opts = "--iosize {0} -d".format(max_f)
 
                     else:
-                        size_sync_opts = "--iosize {0}".format(ASYNC_FACTOR)
+                        if oper == 'randread' or oper == 'read':
+                            size_sync_opts = "--iosize " + str(SYNC_FACTOR)
+                        else:
+                            size_sync_opts = "--iosize " + str(ASYNC_FACTOR)
 
                     # size_sync_opts = get_file_size_opts(sync_type)