qa/suites/rados/upgrade/jewel-x-singleton: upgrade mons first; box thrasher

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

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
index ab5dcace9f72349a6217ee41395abe01e9a5246e..94de7c584b1417404e7d0a657dc6b990526436e9 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -8,5 +8,7 @@ tasks:
     osd.0: 
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
+    daemons: [mon.a, mon.b, mon.c]
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
 - print: "**** done ceph.restart 1st half"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
index a600a166a8646023efff88d48571ca0d03b67005..d37204ab20701d6a610310f2dd8e9cbc2af555ad 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
@@ -9,8 +9,12 @@ overrides:
     - objects unfound and apparently lost
     - log bound mismatch
 tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- print: "**** done thrashosds 3-thrash"
+- parallel:
+    - split_tasks
+split_tasks:
+  sequential:
+    - thrashosds:
+        timeout: 1200
+        chance_pgnum_grow: 1
+        chance_pgpnum_fix: 1
+    - print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml
deleted file mode 100644 (file)
index e3c369d..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   restart mon.a so it is upgraded to -x
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.a"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
index 84827e40c8435efdfa55eb214bb7a00532b23c77..e35bfc2208de788ef3f086c683a3c4a13ab2537a 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
@@ -1,10 +1,11 @@
 meta:
 - desc: |
    run basic cls tests for rbd
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done cls/test_cls_rbd.sh 5-workload"
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
index dd3d25f54efb92a18ccba82168fbf99a5159729d..9d6c2e23296984cdfbf329e1ff53cc57a35ac0eb 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
@@ -1,12 +1,13 @@
 meta:
 - desc: |
    run basic import/export cli tests for rbd
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh 5-workload"
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
+        client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
index 1b161b4f27ed7cfb0107042d4a65fe97b1e79575..0382520a09efc77f43da5ada74604348c4c647c0 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
@@ -2,15 +2,16 @@ meta:
 - desc: |
    randomized correctness test for rados operations on a replicated pool, 
    using only reads, writes, and deletes
-tasks:
-- full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 500
-      write_append_excl: false
-      op_weights:
-        read: 45
-        write: 45
-        delete: 10
-- print: "**** done rados/readwrite 5-workload"
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 500
+        write_append_excl: false
+        op_weights:
+          read: 45
+          write: 45
+          delete: 10
+  - print: "**** done rados/readwrite 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
index 71445bd62425d4016bcd681168876de45e66e119..c96cfbe300428ea57c809aec8c40fb504887c7d2 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
@@ -1,18 +1,19 @@
 meta:
 - desc: |
    randomized correctness test for rados operations on a replicated pool with snapshot operations
-tasks:
-- full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-- print: "**** done rados/snaps-few-objects 5-workload"
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 50
+        write_append_excl: false
+        op_weights:
+          read: 100
+          write: 100
+          delete: 50
+          snap_create: 50
+          snap_remove: 50
+          rollback: 50
+  - print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index ba71c73..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   restart mon.b so it is upgraded to -x
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.b 6-next-mon"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
index 7d2be5f193b3cfaadf76f7c8577d03e25a7639af..2cfbf1dcff5af416d67468b8be8f71cae17db521 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
@@ -2,39 +2,40 @@ meta:
 - desc: |
    run randomized correctness test for rados operations
    generate write load with rados bench
-tasks:
-- full_sequential:
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-- print: "**** done radosbench 7-workload"
+split_tasks:
+  sequential:
+  - full_sequential:
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+  - print: "**** done radosbench 7-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
index 81067e63cfb58dc2ab4e701ff202edfd68130009..22a5f5750d3a8dc0a5d24391bc6b0e04f8295fcd 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
@@ -1,10 +1,11 @@
 meta:
 - desc: |
    librbd C and C++ api tests
-tasks:
-- workunit:
-     branch: jewel
-     clients:
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
         client.0:
            - rbd/test_librbd.sh
-- print: "**** done rbd/test_librbd.sh 7-workload"
+  - print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml
new file mode 100644 (file)
index 0000000..7f16327
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+    install upgrade on remaining node
+    restartin remaining osds
+tasks:
+- install.upgrade:
+    osd.3:
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index 12788b7..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   restart mon.c so it is upgraded to -x
-   as all mon were upgrated, expected ceph cluster reach quorum
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c 8-next-mon"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- print: "**** done wait_for_mon_quorum 8-next-mon"