hardware_StorageFio: Use bw instead of _bw_mean
In fio 2.15, bw_mean is not computed if log are not enabled.
Use mean bandwith instead.
It is fixed in fio 2.20, in the meantime, use regualr _bw variables.
BUG=chromium:755784
TEST=Without change, using fio 2.15, check we fail the constraint
checks, pass with it.
Change-Id: Id507aa6ad23b67f355614a96b2289028875eeebe
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/617240
Reviewed-by: Grant Grundler <grundler@chromium.org>
(cherry picked from commit 8ce50b6b10b6da37d4000f2d99e89b7bef63cf39)
Reviewed-on: https://chromium-review.googlesource.com/668803
diff --git a/client/site_tests/hardware_StorageFio/control.hwqual b/client/site_tests/hardware_StorageFio/control.hwqual
index 4ce789f..6eddcea 100644
--- a/client/site_tests/hardware_StorageFio/control.hwqual
+++ b/client/site_tests/hardware_StorageFio/control.hwqual
@@ -24,7 +24,7 @@
job.run_test('hardware_StorageFio',
constraints=[
- '_seq_read_read_bw_mean >= 50 * 1024',
- '_seq_write_write_bw_mean >= 15 * 1024',
+ '_seq_read_read_bw >= 50 * 1024',
+ '_seq_write_write_bw >= 15 * 1024',
'_16k_write_write_iops >= 10',
])
diff --git a/client/site_tests/suite_HWQual/control.auto b/client/site_tests/suite_HWQual/control.auto
index d8f0c2e..0fcad9c 100644
--- a/client/site_tests/suite_HWQual/control.auto
+++ b/client/site_tests/suite_HWQual/control.auto
@@ -49,8 +49,8 @@
('4k_write', [])
],
constraints=[
- '_seq_read_read_bw_mean >= 50 * 1024',
- '_seq_write_write_bw_mean >= 15 * 1024',
+ '_seq_read_read_bw >= 50 * 1024',
+ '_seq_write_write_bw >= 15 * 1024',
'_4k_write_write_iops >= 10',
])
job.run_test('hardware_DiskSize',
diff --git a/server/site_tests/hardware_StorageQualBase/hardware_StorageQualBase.py b/server/site_tests/hardware_StorageQualBase/hardware_StorageQualBase.py
index d5abb34..9fe90ec 100644
--- a/server/site_tests/hardware_StorageQualBase/hardware_StorageQualBase.py
+++ b/server/site_tests/hardware_StorageQualBase/hardware_StorageQualBase.py
@@ -19,8 +19,8 @@
('hardware_SsdDetection', {
'constraints': ['mb_ssd_device_size >= 8000']}),
('hardware_StorageFio', {'constraints': [
- '_seq_read_read_bw_mean >= 50 * 1024',
- '_seq_write_write_bw_mean >= 15 * 1024',
+ '_seq_read_read_bw >= 50 * 1024',
+ '_seq_write_write_bw >= 15 * 1024',
'_16k_write_write_iops >= 10'],
'requirements': [
('seq_read', []),
