Initial checkin for hammer-x suite

Used "ceph osd crush tunables hammer"

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

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

diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..30aac17
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
@@ -0,0 +1,19 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+  - client.1
+overrides:
+  ceph:
+    log-whitelist:
+    - scrub mismatch
+    - ScrubResult
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false

diff --git a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
new file mode 100644 (file)
index 0000000..a5700a1
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: hammer
+- print: "**** done installing hammer"
+- ceph:
+    fs: xfs
+- print: "**** done ceph"
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done parallel"

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

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
new file mode 120000 (symlink)
index 0000000..a8a0ae6
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/hammer-x/parallel/2-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..35075b6
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/rados_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - cls
+    - print: "**** done cls 2-workload"

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-x/parallel/2-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..086990d
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -0,0 +1,8 @@
+workload:
+  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-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..7b43db5
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  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-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..bdcc277
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_python.yaml
@@ -0,0 +1,8 @@
+workload:
+  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-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..3f74d7d
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -0,0 +1,8 @@
+upgrade-sequence:
+   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"

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..c7cb960
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,37 @@
+upgrade-sequence:
+   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"
+#do we need to use "ceph osd crush tunables hammer" ?
+   - exec:
+      mon.b:
+        - ceph osd crush tunables hammer
+   - print: "**** done ceph osd crush tunables hammer"
+   - 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

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

diff --git a/suites/upgrade/hammer-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..1122607
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/4-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 rados 4-final-workload"

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

diff --git a/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..f1e30f2
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,10 @@
+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/hammer-x/parallel/4-final-workload/rbd_cls.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..ed75230
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/4-final-workload/rbd_cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/4-final-workload/rbd_import_export.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..2c66c28
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/4-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 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/4-final-workload/rgw_swift.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..18089be
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/4-final-workload/rgw_swift.yaml
@@ -0,0 +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"

diff --git a/suites/upgrade/hammer-x/parallel/distros b/suites/upgrade/hammer-x/parallel/distros
new file mode 120000 (symlink)
index 0000000..79010c3
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/distros
@@ -0,0 +1 @@
+../../../../distros/supported
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/% b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-cluster b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-cluster
new file mode 120000 (symlink)
index 0000000..6dceffa
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-cluster
@@ -0,0 +1 @@
+../stress-split/0-cluster
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/1-hammer-install b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/1-hammer-install
new file mode 120000 (symlink)
index 0000000..84c9cce
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/1-hammer-install
@@ -0,0 +1 @@
+../stress-split/1-hammer-install
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/2-partial-upgrade b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/2-partial-upgrade
new file mode 120000 (symlink)
index 0000000..c3a4e2c
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/2-partial-upgrade
@@ -0,0 +1 @@
+../stress-split/2-partial-upgrade
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..a33d4e3
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+    min_in: 4
+- print: "**** done thrashosds 3-thrash"

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon
new file mode 120000 (symlink)
index 0000000..0ea7dd5
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon
@@ -0,0 +1 @@
+../stress-split/4-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml
new file mode 120000 (symlink)
index 0000000..a8a0ae6
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
new file mode 120000 (symlink)
index 0000000..0f00e43
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
@@ -0,0 +1 @@
+../stress-split/6-next-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon
new file mode 120000 (symlink)
index 0000000..726c6a4
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon
@@ -0,0 +1 @@
+../stress-split/8-next-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
new file mode 100644 (file)
index 0000000..75c6275
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
@@ -0,0 +1,25 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    ec_pool: true
+    erasure_code_profile:
+      name: isaprofile
+      plugin: isa
+      k: 2
+      m: 1
+      technique: reed_sol_van
+      ruleset-failure-domain: osd
+    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 ec-rados-plugin=isa-k=2-m=1 9-workload"

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml
new file mode 100644 (file)
index 0000000..be14f23
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/rhel_7.0.yaml
@@ -0,0 +1,3 @@
+os_type: rhel
+os_version: "7.0"
+arch: x86_64

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml
new file mode 100644 (file)
index 0000000..12d479f
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/distros/ubuntu_14.04.yaml
@@ -0,0 +1,3 @@
+os_type: ubuntu
+os_version: "14.04"
+arch: x86_64

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/% b/suites/upgrade/hammer-x/stress-split-erasure-code/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/0-cluster b/suites/upgrade/hammer-x/stress-split-erasure-code/0-cluster
new file mode 120000 (symlink)
index 0000000..6dceffa
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/0-cluster
@@ -0,0 +1 @@
+../stress-split/0-cluster
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/1-hammer-install b/suites/upgrade/hammer-x/stress-split-erasure-code/1-hammer-install
new file mode 120000 (symlink)
index 0000000..330854c
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/1-hammer-install
@@ -0,0 +1 @@
+../stress-split/1-hammer-install/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/2-partial-upgrade b/suites/upgrade/hammer-x/stress-split-erasure-code/2-partial-upgrade
new file mode 120000 (symlink)
index 0000000..c3a4e2c
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/2-partial-upgrade
@@ -0,0 +1 @@
+../stress-split/2-partial-upgrade
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..a33d4e3
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+    min_in: 4
+- print: "**** done thrashosds 3-thrash"

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/4-mon b/suites/upgrade/hammer-x/stress-split-erasure-code/4-mon
new file mode 120000 (symlink)
index 0000000..0ea7dd5
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/4-mon
@@ -0,0 +1 @@
+../stress-split/4-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
new file mode 120000 (symlink)
index 0000000..a8a0ae6
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/6-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code/6-next-mon
new file mode 120000 (symlink)
index 0000000..0f00e43
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/6-next-mon
@@ -0,0 +1 @@
+../stress-split/6-next-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/8-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code/8-next-mon
new file mode 120000 (symlink)
index 0000000..726c6a4
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/8-next-mon
@@ -0,0 +1 @@
+../stress-split/8-next-mon
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/distros b/suites/upgrade/hammer-x/stress-split-erasure-code/distros
new file mode 120000 (symlink)
index 0000000..8d43097
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split-erasure-code/distros
@@ -0,0 +1 @@
+../stress-split/distros
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split/% b/suites/upgrade/hammer-x/stress-split/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-x/stress-split/0-cluster/start.yaml b/suites/upgrade/hammer-x/stress-split/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..9ea0a27
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/0-cluster/start.yaml
@@ -0,0 +1,25 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - osd.4
+  - osd.5
+  - osd.6
+- - osd.7
+  - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
+  - osd.12
+  - osd.13
+- - client.0

diff --git a/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml
new file mode 100644 (file)
index 0000000..6c2470d
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    branch: hammer
+- print: "**** done install hammer"
+- ceph:
+    fs: xfs
+- print: "**** done ceph"

diff --git a/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml
new file mode 100644 (file)
index 0000000..d42633e
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install.upgrade:
+    osd.0: 
+- print: "**** done install.upgrade osd.0"
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6]
+- print: "**** done ceph.restart 1st half"

diff --git a/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..d99d0c8
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - 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"

diff --git a/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml b/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml
new file mode 100644 (file)
index 0000000..7c75c10
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.a"

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/+ b/suites/upgrade/hammer-x/stress-split/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..1bcd1b8
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: hammer
+    clients:
+      client.0:
+        - cls/test_cls_rbd.sh
+- print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..882d979
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml
@@ -0,0 +1,9 @@
+tasks:
+- workunit:
+    branch: hammer
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh 5-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..37c2148
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
@@ -0,0 +1,10 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10
+- print: "**** done rados/readwrite 5-workload"

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
new file mode 100644 (file)
index 0000000..f01232a
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
@@ -0,0 +1,13 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    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/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml
new file mode 100644 (file)
index 0000000..22e87c7
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml
@@ -0,0 +1,6 @@
+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/suites/upgrade/hammer-x/stress-split/7-workload/+ b/suites/upgrade/hammer-x/stress-split/7-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..3d87bb1
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- radosbench:
+    clients: [client.0]
+    time: 1800
+- print: "**** done radosbench 7-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..19a24c2
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     branch: hammer
+     clients:
+        client.0:
+           - rbd/test_librbd.sh
+- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
new file mode 100644 (file)
index 0000000..6125368
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
@@ -0,0 +1,8 @@
+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"

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

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..0ea5639
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: hammer
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..8f14160
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rgw: 
+    client.0:
+    default_idle_timeout: 300
+- print: "**** done rgw 9-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 9-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..9e311c9
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/hammer-x/stress-split/distros b/suites/upgrade/hammer-x/stress-split/distros
new file mode 120000 (symlink)
index 0000000..79010c3
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/distros
@@ -0,0 +1 @@
+../../../../distros/supported
\ No newline at end of file