suites: run rados bench for max 180 seconds

If we want a longer runtime than that, run it several times in
sequence.

This limits the amount of disk space we'll consume.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/powercycle/osd/tasks/radosbench.yaml b/suites/powercycle/osd/tasks/radosbench.yaml
index 656db858f0188400fee7988b80a92e2c7929e698..7fb27b25a6198a5df7a5bf8b33dce9e3eab21c26 100644 (file)
--- a/suites/powercycle/osd/tasks/radosbench.yaml
+++ b/suites/powercycle/osd/tasks/radosbench.yaml
@@ -1,4 +1,23 @@
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 200
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180

diff --git a/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml b/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml
index 7aaf0e1c30b1b9b4900203eabe0171c5d80e200c..d2fab6989e14288262bda52da6e63a5748cf3caa 100644 (file)
--- a/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml
+++ b/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml
@@ -1,6 +1,17 @@
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 300
-    unique_pool: true
-    ec_pool: true
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+      unique_pool: true
+      ec_pool: true
+  - radosbench:
+      clients: [client.0]
+      time: 180
+      unique_pool: true
+      ec_pool: true
+  - radosbench:
+      clients: [client.0]
+      time: 180
+      unique_pool: true
+      ec_pool: true

diff --git a/suites/rados/thrash/workloads/radosbench.yaml b/suites/rados/thrash/workloads/radosbench.yaml
index ae7a696d9ae91b460fd29db6a578596b2a0b140f..3a3f9ae70cd14cea55432405dccdcb7135e18c71 100644 (file)
--- a/suites/rados/thrash/workloads/radosbench.yaml
+++ b/suites/rados/thrash/workloads/radosbench.yaml
@@ -6,6 +6,16 @@ overrides:
         debug objecter: 20
         debug rados: 20
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 200
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180

diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml
index c7ea69bc14cb7489b18fae37316537d7f85e5457..a471cf8720b5b2eb0b17c5e89ee193514e71479f 100644 (file)
--- a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml
+++ b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml
@@ -1,5 +1,15 @@
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 900
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
 - print: "**** done radosbench 7-workload"

diff --git a/suites/smoke/basic/tasks/rados_bench.yaml b/suites/smoke/basic/tasks/rados_bench.yaml
index f93b4a610ce99ab2d54bf37502df1502dd2819c4..a70fb449037cf7f115b55f5d7937e4843d15aa43 100644 (file)
--- a/suites/smoke/basic/tasks/rados_bench.yaml
+++ b/suites/smoke/basic/tasks/rados_bench.yaml
@@ -18,7 +18,16 @@ tasks:
     chance_pgnum_grow: 2
     chance_pgpnum_fix: 1
     timeout: 1200
-- radosbench:
-    clients:
-    - client.0
-    time: 1800
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180

diff --git a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml
index 447b31bc754e419650dc95b1ed0969fb5ae7636e..f05fc511192fcf740b03dc1cc031201d215dfc43 100644 (file)
--- a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml
+++ b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml
@@ -1,5 +1,27 @@
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
 - print: "**** done 07-workload/radosbench.yaml"

diff --git a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml
index ce856cfbdbd51e610aa3807c6dbd95a436678d02..7b72d946af4000eae76096f02e27037dca04e823 100644 (file)
--- a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml
+++ b/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml
@@ -1,5 +1,27 @@
 tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
 - print: "**** done 19-workload/radosbench.yaml"

diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
index 4ec14650a3a991b90c3265bb137264bec8898949..9bc489f4a3f823cc84896394f63f01fda07a9207 100644 (file)
--- a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
+++ b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
@@ -2,5 +2,29 @@ tasks:
 - full_sequential:
   - radosbench:
       clients: [client.0]
-      time: 1800
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
 - print: "**** done radosbench 7-workload"

diff --git a/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml
index e2aa5dc9a9c43a55a6730d324dbd11c9cbacaec0..17d4d71f9fa03ebadc8e3153f5ad4685f728787e 100644 (file)
--- a/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml
+++ b/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml
@@ -6,5 +6,29 @@ tasks:
 - full_sequential:
   - radosbench:
       clients: [client.0]
-      time: 1800
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
+  - radosbench:
+      clients: [client.0]
+      time: 180
 - print: "**** done radosbench 7-workload"