Merge pull request #259 from ceph/wip-10223

Changed workloads in 2-workload to run in parallel

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"

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:

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"