Changed workloads in 2-workload to run in parallel

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/erasure-code/ec-rados-default.yaml b/erasure-code/ec-rados-default.yaml
index 1f13957536d355775a432574bfda1e454fe40275..11f0c6bd89b3cc07faa9e2bdef4894b0152e7d6e 100644 (file)
--- a/erasure-code/ec-rados-default.yaml
+++ b/erasure-code/ec-rados-default.yaml
@@ -1,5 +1,5 @@
 workload:
-  sequential:
+  parallel:
     - rados:
        clients: [client.0]
        ops: 4000
@@ -16,3 +16,4 @@ workload:
          copy_from: 50
          setattr: 25
          rmattr: 25
+    - print: "**** done rados ec"

diff --git a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml
index 30aac173ce8ffd08c2caa9ffcf526671d4866d50..fcb90eed8425c3800676717173ee998f95b117f2 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/firefly-x/parallel/0-cluster/start.yaml
@@ -9,6 +9,9 @@ roles:
   - osd.3
 - - client.0
   - client.1
+  - client.2
+  - client.3
+  - client.4
 overrides:
   ceph:
     log-whitelist:

diff --git a/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml
index cb9feb735e17d364f6c1acbbc34fbb314e0dc279..f8c18a3cb7ef4740b9710a0e19cf0b80c4def564 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml
+++ b/suites/upgrade/firefly-x/parallel/2-workload/rados_api.yaml
@@ -1,8 +1,8 @@
 workload:
-  sequential:
+  parallel:
     - workunit:
         branch: firefly
         clients:
-          client.0:
+          client.1:
             - cls
-
+    - print: "**** done cls 2-workload"

diff --git a/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml
index 3ea4fb404cc2709add4f1b4dbdd79546d1ce2a43..6f1429acb77601ef4a7f62808b564b6f46e2135a 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/firefly-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -1,7 +1,8 @@
 workload:
-  sequential:
+  parallel:
     - workunit:
         branch: firefly
         clients:
-          client.0:
+          client.2:
             - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml
index 71b2fefae01763e04f3f949da4b52549c7c8c64a..0339c57509632400676ee087fe793548e28b585f 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml
+++ b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_api.yaml
@@ -1,7 +1,8 @@
 workload:
-  sequential:
+  parallel:
     - workunit:
         branch: firefly
         clients:
-          client.0:
+          client.3:
             - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml
index c3459fba6e9612a9caa98b85a0af981d5798494a..fce9039ed410264960c493cc9f60362c02f6e530 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml
+++ b/suites/upgrade/firefly-x/parallel/2-workload/test_rbd_python.yaml
@@ -1,7 +1,8 @@
 workload:
-  sequential:
+  parallel:
     - workunit:
         branch: firefly
         clients:
-          client.0:
+          client.4:
             - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
index 40f66da37f2567ead9429653ce5c5e995c0643b6..112260734b0bc623eb03f0a6a89eb18b71de5b44 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
@@ -10,3 +10,4 @@ tasks:
         snap_create: 50
         snap_remove: 50
         rollback: 50
+  - print: "**** done rados 4-final-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml
index faa96ed24d52ebf5ec6811ff457999a0442966c0..d4a8006e906bf1d6bcd03b711a4646c16c394df9 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_loadgenmix.yaml
@@ -3,3 +3,4 @@ tasks:
       clients:
         client.1:
           - rados/load-gen-mix.sh
+  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
index 88019bef17ad8ff925df434f3a7a21e48505e9c6..f1e30f2419d8ec19dd41517ec57de9ee8c71c3f3 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -2,7 +2,9 @@ tasks:
   - mon_thrash:
       revive_delay: 20
       thrash_delay: 1
+  - print: "**** done mon_thrash 4-final-workload"
   - workunit:
       clients:
         client.1:
           - rados/test.sh
+  - print: "**** done rados/test.sh 4-final-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml
index 4ef47768237e9a246718abc11c8d56ba1252a26a..ed75230497d095481627f201cb0e20c0c569ab0b 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_cls.yaml
@@ -3,4 +3,4 @@ tasks:
       clients:
         client.1:
           - cls/test_cls_rbd.sh
-
+  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml
index 6c40377324d4dd5b8bbc84869fb307ee976217b8..2c66c28a2767a70880e3400bac7765c151afb4ac 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rbd_import_export.yaml
@@ -5,3 +5,4 @@ tasks:
           - rbd/import_export.sh
       env:
         RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 4-final-workload"

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml
index 445224cef2dc945762e8f4b766aa529868194ffb..18089bec6ddd0684ad17ec76e24132be443d9def 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rgw_swift.yaml
@@ -1,5 +1,7 @@
 tasks:
   - rgw: [client.1]
+  - print: "**** done rgw 4-final-workload"
   - swift:
       client.1:
         rgw_server: client.1
+  - print: "**** done swift 4-final-workload"