upgrade/hammer-x: run rados.py to completion before moving on

Leave the final workloads alone.. those can run in parallel
with other stuff.

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

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
index cc62371e3242f64e67c987f4856b5e0e977b95e3..00e3c3d0de3f482e26139fcecea8248c88fb229f 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
+++ b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
@@ -1,4 +1,5 @@
 tasks:
+- full_sequential:
   - rados:
       clients: [client.0]
       ops: 4000

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
index 922e61fdfc032337e066816cb2138e624b3be3ff..afbc3566c424d1129c967f4d175a5e54e7a81816 100644 (file)
--- a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
@@ -1,5 +1,6 @@
 tasks:
-- rados:
+- full_sequential:
+  - rados:
     clients: [client.0]
     ops: 4000
     objects: 500

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
index 33c820d127733e3be042e028cc7f02941c749367..311f4b1afc768fa8891d01705a82b91d499a2165 100644 (file)
--- a/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
@@ -1,5 +1,6 @@
 tasks:
-- rados:
+- full_sequential:
+  - rados:
     clients: [client.0]
     ops: 4000
     objects: 50

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 3d87bb1c2c54a17ee20a43c910e1405eb3cf0110..c6c7bd035ff8054908cc3ac2f5f3ef7c680803ae 100644 (file)
--- a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
+++ b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
@@ -1,5 +1,6 @@
 tasks:
-- radosbench:
+- full_sequential:
+  - radosbench:
     clients: [client.0]
     time: 1800
 - print: "**** done radosbench 7-workload"