upgrade/hammer-jewel-x/parallel: update

Merger hammer-x (jewel branch) and jewel-x (master branch).

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

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..021fcc6
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.2 before running workunit
+workload:
+  full_sequential:
+  - sequential:
+    - ceph-fuse:
+    - print: "**** done ceph-fuse 2-workload"
+    - workunit:
+        clients:
+           client.2:
+            - suites/blogbench.sh
+    - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml
new file mode 100644 (file)
index 0000000..e4f3ee1
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml
@@ -0,0 +1,20 @@
+workload:
+  full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done rados ec task"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml
index 2720afad19b40c3a64943a74033ca719dc59796c..d86c2d2b30992d581f5f01b152ad0a2300216c2b 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml
@@ -1,9 +1,8 @@
 workload:
-   sequential:
-   - workunit:
-       branch: hammer
-       clients:
-         client.0:
-         #- rados/test-upgrade-v9.0.1.sh
-         - cls
-   - print: "**** done  2-workload/rados_api.yaml"
+  full_sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - cls
+    - print: "**** done cls 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml
index 30f09e124e79afcec736448db224f5044595f9d1..50ba8083dfc376685a14063cf91834c3a654f3e9 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -1,8 +1,8 @@
 workload:
-   sequential:
-   - workunit:
-       branch: hammer
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh"
+  full_sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml
index 70dc94e33162075237c6f5f60dde72d4aed476d7..997f7ba92b8624a2a80902194f0247c2e7929371 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml
@@ -1,8 +1,8 @@
-#workload:
-#  sequential:
-#  - workunit:
-#      branch: hammer
-#      clients:
-#        client.0:
-#        - rbd/test_librbd.sh
-#  - print: "**** done rbd/test_librbd.sh"
+workload:
+  full_sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml
index 11f00bcf6db6613ca1ba7ecccffc58fc3ffacab1..d1046da46e9e9c9455f467c2c63f1a4c6e680c2a 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml
@@ -1,8 +1,8 @@
-#workload:
-#  sequential:
-#  - workunit:
-#      branch: hammer
-#      clients:
-#        client.0:
-#        - rbd/test_librbd_python.sh
-#  - print: "**** done rbd/test_librbd_python.sh"
+workload:
+  full_sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index cdc2729e78b0065b5c49c441cfbfee15f1c91763..ec1a88c767cf7a9d083a916bc7af348303f3f43c 100644 (file)
--- a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -1,13 +1,17 @@
 upgrade-sequence:
    sequential:
-   - install.upgrade:
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - print: "**** done ceph.restart do not wait for healthy"
+   - exec:
        mon.a:
-         branch: jewel
-       mon.b:
-         branch: jewel
-   - print: "**** done install.upgrade mon.a & mon.b to branch: jewel"
-   - ceph.restart: [osd.0, osd.1, osd.2, osd.3]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a]
-   - print: "**** done ceph.restart all"
+         - sleep 300 # http://tracker.ceph.com/issues/17808
+         - ceph osd set require_jewel_osds
+   - ceph.healthy:
+   - print: "**** done ceph.healthy"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 951dbfd..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: jewel
-   - print: "**** done install.upgrade mon.a to branch: jewel"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - print: "**** done ceph.restart [mon.a] [osd.0, osd.1] [mds.a]"
-   - exec:
-      mon.b:
-        # is this command valid?
-        - ceph osd crush tunables hammer
-   - install.upgrade:
-       mon.b:
-         branch: jewel
-   - print: "**** done install.upgrade mon.b to branch: jewel"
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - print: "**** done ceph.restart [osd.2, osd.3] & [mon.b, mon.c]"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
new file mode 100644 (file)
index 0000000..b5acf98
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
@@ -0,0 +1,38 @@
+upgrade-sequence:
+   sequential:
+   - ceph.restart:
+       daemons: [osd.0, osd.1]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.2, osd.3]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - print: "**** running mixed versions of osds and mons"
+#do we need to use "ceph osd crush tunables hammer" ?
+   - exec:
+      mon.b:
+        - sudo ceph osd crush tunables hammer
+   - print: "**** done ceph osd crush tunables hammer"
+   - ceph.restart:
+       daemons: [mon.b, mon.c]
+       wait-for-healthy: false
+   - sleep:
+       duration: 30
+   - exec:
+       osd.0:
+         - sleep 300 # http://tracker.ceph.com/issues/17808
+         - ceph osd set require_jewel_osds
+   - ceph.healthy:
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade/hammer-jewel-x/parallel/4-hammer-jewel-x-upgrade/hammer-jewel-x.yaml b/suites/upgrade/hammer-jewel-x/parallel/4-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
deleted file mode 100644 (file)
index 37a880b..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/4-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-   - parallel:
-     - workload2
-     - upgrade-sequence2
-   - print: "**** done parallel workload2 and upgrade-sequence2"
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml b/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml
new file mode 120000 (symlink)
index 0000000..987c18c
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml
@@ -0,0 +1 @@
+../../../../releases/jewel.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
new file mode 100644 (file)
index 0000000..37a880b
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
@@ -0,0 +1,8 @@
+tasks:
+   - parallel:
+     - workload2
+     - upgrade-sequence2
+   - print: "**** done parallel workload2 and upgrade-sequence2"
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_api.yaml
deleted file mode 100644 (file)
index 3b58f80..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_api.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - reached quota
-workload2:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-        - rados/test-upgrade-v11.0.0.sh
-        - cls
-  - print: "**** done rados/test-upgrade-v11.0.0.sh and cls"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index a612ac0..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-        - rados/load-gen-big.sh
-  - print: "**** done rados/load-gen-big.sh 2"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index e7647c3..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-#workload2:
-#  sequential:
-#  - workunit:
-#      branch: hammer
-#      clients:
-#        client.0:
-#        - rbd/test_librbd.sh
-#  - print: "**** done rbd/test_librbd.sh 2"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_python.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index b7ad946..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-#workload2:
-#  sequential:
-#  - workunit:
-#      branch: hammer
-#      clients:
-#        client.0:
-#        - rbd/test_librbd_python.sh
-#  - print: "**** done rbd/test_librbd_python.sh 2"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index ada4150..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-upgrade-sequence2:
-   sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade mon.a and mon.b"
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-   - print: "**** done ceph.restart all"
-   - exec:
-      mon.b:
-        - ceph osd set require_jewel_osds
-   - print: "**** done exec 'ceph osd set require_jewel_osds'"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml
deleted file mode 100644 (file)
index 226b08a..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-upgrade-sequence2:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-   - exec:
-      mon.b:
-        - ceph osd crush tunables jewel
-   - print: "**** done exec 'ceph osd crush tunables jewel'"
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       #wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - exec:
-      mon.b:
-        - ceph osd set require_jewel_osds
-   - print: "**** done exec 'ceph osd set require_jewel_osds'"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..021fcc6
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.2 before running workunit
+workload:
+  full_sequential:
+  - sequential:
+    - ceph-fuse:
+    - print: "**** done ceph-fuse 2-workload"
+    - workunit:
+        clients:
+           client.2:
+            - suites/blogbench.sh
+    - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
new file mode 100644 (file)
index 0000000..5c5a958
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
@@ -0,0 +1,24 @@
+meta:
+- desc: |
+   run run randomized correctness test for rados operations
+   on an erasure-coded pool
+workload:
+  full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done rados ec task"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..348f1ae
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   object class functional tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: jewel
+        clients:
+          client.0:
+            - cls
+    - print: "**** done cls 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..a91ed2c
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1MB to 25MB
+workload:
+  full_sequential:
+    - workunit:
+        branch: jewel
+        clients:
+          client.0:
+            - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..15d892e
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: jewel
+        clients:
+          client.0:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..bb2d3ea
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd python api tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: jewel
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml
deleted file mode 120000 (symlink)
index 4baff9b..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 120000 (symlink)
index 4b9d9a4..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index e0b0ba1..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- rados:
-    clients: [client.1]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-- print: "**** done 7-final-workload/rados-snaps-few-objects.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index b1c6791..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-        - rados/load-gen-mix.sh
-  - print: "**** done 7-final-workload/rados_loadgenmix.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 807afb9..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-   - sequential:
-      - mon_thrash:
-          revive_delay: 20
-          thrash_delay: 1
-      - workunit:
-          branch: jewel
-          clients:
-            client.1:
-            - rados/test-upgrade-v11.0.0.sh
-      - print: "**** done rados/test-upgrade-v11.0.0.sh from 7-final-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_cls.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index 973c438..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-      - cls/test_cls_rbd.sh
-- print: "**** done 7-final-workload/rbd_cls.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_import_export.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index d8116a9..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.1:
-        - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh from 7-final-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rgw_s3tests.yaml
deleted file mode 100644 (file)
index f1cf2de..0000000
--- a/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rgw: [client.1]
-- s3tests:
-    client.1:
-      rgw_server: client.1
-- print: "**** done rgw_server from 7-final-workload"
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw lc debug interval: 10

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..02cba21
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
@@ -0,0 +1,15 @@
+meta:
+- desc: |
+   upgrade the ceph cluster
+upgrade-sequence:
+   sequential:
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - exec:
+       mon.a:
+         - ceph osd set require_kraken_osds
+   - ceph.restart:
+       daemons: [osd.0]
+   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
new file mode 100644 (file)
index 0000000..b5542b4
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
@@ -0,0 +1,42 @@
+meta:
+- desc: |
+   upgrade the ceph cluster,
+   upgrate in two steps
+   step one ordering: mon.a, osd.0, osd.1, mds.a
+   step two ordering: mon.b, mon.c, osd.2, osd.3
+   ceph expected to be healthy state after each step
+upgrade-sequence:
+   sequential:
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - print: "**** running mixed versions of osds and mons"
+   - exec:
+      mon.b:
+        - sudo ceph osd crush tunables jewel
+   - print: "**** done ceph osd crush tunables jewel"
+   - ceph.restart:
+       daemons: [mon.b, mon.c]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.2, osd.3]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - exec:
+       mon.a:
+         - ceph osd set require_kraken_osds
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml b/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml
new file mode 120000 (symlink)
index 0000000..a890722
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml
@@ -0,0 +1 @@
+../../../../releases/kraken.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..d2629c0
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 5-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 5-final-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..e0b0ba1
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,13 @@
+tasks:
+- rados:
+    clients: [client.1]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+- print: "**** done 7-final-workload/rados-snaps-few-objects.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..b1c6791
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,6 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+        - rados/load-gen-mix.sh
+  - print: "**** done 7-final-workload/rados_loadgenmix.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..807afb9
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,11 @@
+tasks:
+   - sequential:
+      - mon_thrash:
+          revive_delay: 20
+          thrash_delay: 1
+      - workunit:
+          branch: jewel
+          clients:
+            client.1:
+            - rados/test-upgrade-v11.0.0.sh
+      - print: "**** done rados/test-upgrade-v11.0.0.sh from 7-final-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..973c438
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.1:
+      - cls/test_cls_rbd.sh
+- print: "**** done 7-final-workload/rbd_cls.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..d8116a9
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml
@@ -0,0 +1,8 @@
+tasks:
+- workunit:
+     clients:
+        client.1:
+        - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh from 7-final-workload"

diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..f1cf2de
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml
@@ -0,0 +1,11 @@
+tasks:
+- rgw: [client.1]
+- s3tests:
+    client.1:
+      rgw_server: client.1
+- print: "**** done rgw_server from 7-final-workload"
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw lc debug interval: 10