From: Yuri Weinstein Date: Mon, 17 Oct 2016 20:28:54 +0000 (+0000) Subject: Added new hammer-jewel-x suite X-Git-Tag: v11.1.1~58^2^2~10^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03427961b99404caa790a1461568e771a134dda6;p=ceph.git Added new hammer-jewel-x suite Removed rbd/test_librbd_python.sh for now Removed all `sudo` from exec lines Signed-off-by: Yuri Weinstein --- diff --git a/suites/upgrade/hammer-jewel-x/parallel/% b/suites/upgrade/hammer-jewel-x/parallel/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml new file mode 100644 index 00000000000..5caa3dfb946 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml @@ -0,0 +1,17 @@ +overrides: + ceph: + conf: + mon: + mon warn on legacy crush tunables: false + mon debug unsafe allow tier with nonempty snaps: true +roles: +- - mon.a + - mds.a + - osd.0 + - osd.1 +- - mon.b + - mon.c + - osd.2 + - osd.3 +- - client.0 + - client.1 diff --git a/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml b/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml new file mode 100644 index 00000000000..e115a535244 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml @@ -0,0 +1,14 @@ +tasks: +- install: + branch: hammer +- print: "**** done hammer" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel" +- install.upgrade: + client.0: + branch: jewel +- print: "*** client.0 upgraded to jewel" diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/+ new file mode 100644 index 00000000000..e69de29bb2d 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 new file mode 100644 index 00000000000..2720afad19b --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml @@ -0,0 +1,9 @@ +workload: + sequential: + - workunit: + branch: hammer + clients: + client.0: + #- rados/test-upgrade-v9.0.1.sh + - cls + - print: "**** done 2-workload/rados_api.yaml" 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 new file mode 100644 index 00000000000..30f09e124e7 --- /dev/null +++ b/suites/upgrade/hammer-jewel-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" 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 new file mode 100644 index 00000000000..70dc94e3316 --- /dev/null +++ b/suites/upgrade/hammer-jewel-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" 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 new file mode 100644 index 00000000000..11f00bcf6db --- /dev/null +++ b/suites/upgrade/hammer-jewel-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" 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 new file mode 100644 index 00000000000..cdc2729e78b --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -0,0 +1,13 @@ +upgrade-sequence: + sequential: + - install.upgrade: + 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" 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 new file mode 100644 index 00000000000..951dbfd3c96 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -0,0 +1,37 @@ +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/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 new file mode 100644 index 00000000000..37a880b52b4 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/4-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/+ new file mode 100644 index 00000000000..e69de29bb2d 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 new file mode 100644 index 00000000000..3b58f802c57 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_api.yaml @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000000..a612ac01a25 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/5-workload/rados_loadgenbig.yaml @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000000..e7647c35934 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_api.yaml @@ -0,0 +1,8 @@ +#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 new file mode 100644 index 00000000000..b7ad9464f48 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/5-workload/test_rbd_python.yaml @@ -0,0 +1,8 @@ +#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 new file mode 100644 index 00000000000..ada41502461 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-all.yaml @@ -0,0 +1,12 @@ +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 new file mode 100644 index 00000000000..226b08af5e7 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml @@ -0,0 +1,40 @@ +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/7-final-workload/+ b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/+ new file mode 100644 index 00000000000..e69de29bb2d 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 new file mode 120000 index 00000000000..4baff9bdd2f --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml @@ -0,0 +1 @@ +../../../../../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 new file mode 120000 index 00000000000..4b9d9a44a24 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-final-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-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 new file mode 100644 index 00000000000..e0b0ba1370d --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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/7-final-workload/rados_loadgenmix.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml new file mode 100644 index 00000000000..b1c67910e08 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml new file mode 100644 index 00000000000..807afb91094 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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/7-final-workload/rbd_cls.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_cls.yaml new file mode 100644 index 00000000000..973c4385df6 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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/7-final-workload/rbd_import_export.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rbd_import_export.yaml new file mode 100644 index 00000000000..d8116a9cfed --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-final-workload/rgw_s3tests.yaml new file mode 100644 index 00000000000..f1cf2de1884 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/7-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 diff --git a/suites/upgrade/hammer-jewel-x/parallel/distros b/suites/upgrade/hammer-jewel-x/parallel/distros new file mode 120000 index 00000000000..79010c36a59 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/distros @@ -0,0 +1 @@ +../../../../distros/supported \ No newline at end of file diff --git a/suites/upgrade/hammer-jewel-x/stress-split/% b/suites/upgrade/hammer-jewel-x/stress-split/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml new file mode 100644 index 00000000000..129635fa52a --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml @@ -0,0 +1,19 @@ +overrides: + ceph: + log-whitelist: + - failed to encode map + conf: + mon: + mon warn on legacy crush tunables: false +roles: +- - mon.a + - mon.b + - mds.a + - osd.0 + - osd.1 + - osd.2 + - mon.c +- - osd.3 + - osd.4 + - osd.5 +- - client.0 diff --git a/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml b/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml new file mode 100644 index 00000000000..47a1a39026a --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml @@ -0,0 +1,6 @@ +tasks: +- install: + branch: hammer +- ceph: + fs: xfs +- print: "**** done install hammer" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml new file mode 100644 index 00000000000..990ccbaa17b --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml @@ -0,0 +1,8 @@ +tasks: +- install.upgrade: + osd.0: + branch: jewel +- print: "**** done install.upgrade jewel" +- ceph.restart: + daemons: [osd.0, osd.1, osd.2] +- print: "**** done 02-partial-upgrade-jewel" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml b/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml new file mode 100644 index 00000000000..07541d6b485 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.0: + - cls/test_cls_rbd.sh +- print: "**** done 03-workload/rbd.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml new file mode 100644 index 00000000000..991b94f2c25 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph.restart: + daemons: [mon.a] + wait-for-healthy: false + wait-for-osds-up: true +- print: "*** done restart mon.a 04-mona-upgrade-jewel/mona.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml new file mode 100644 index 00000000000..507c8f99231 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.0: + - cls/test_cls_rbd.sh +- print: "**** done 05-workload/rbd-cls.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml new file mode 100644 index 00000000000..cacfde1607c --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml @@ -0,0 +1,11 @@ +tasks: +- rados: + clients: [client.0] + ops: 4000 + objects: 500 + write_append_excl: false + op_weights: + read: 45 + write: 45 + delete: 10 +- print: "**** done 05-workload/readwrite.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml new file mode 100644 index 00000000000..2368ee398c6 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph.restart: + daemons: [mon.b] + wait-for-healthy: false + wait-for-osds-up: true +- print: "**** done restarted mon.b 06-monb-upgrade-jewel/monb.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml new file mode 100644 index 00000000000..7f10f7a69b2 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml @@ -0,0 +1,33 @@ +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 +- print: "**** done 07-workload/radosbench.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml new file mode 100644 index 00000000000..0029eec85f3 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml @@ -0,0 +1,6 @@ +#tasks: +#- workunit: +# clients: +# client.0: +# - rbd/test_librbd.sh +#- print: "**** done 07-workload/rbd_api.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml new file mode 100644 index 00000000000..15a71050110 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/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" +- ceph.wait_for_mon_quorum: [a, b, c] +- print: "**** done 08-monc-upgrade-jewel/monc.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml new file mode 100644 index 00000000000..932035642cf --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml @@ -0,0 +1,7 @@ +#tasks: +#- workunit: +# branch: hammer +# clients: +# client.0: +# - rbd/test_librbd_python.sh +#- print: "**** done 09-workload/rbd-python.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml new file mode 100644 index 00000000000..9ee024e9f42 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml @@ -0,0 +1,8 @@ +tasks: +- install.upgrade: + osd.3: + branch: jewel +- print: "**** done install.upgrade jewel" +- ceph.restart: + daemons: [osd.3, osd.4, osd.5] +- print: "**** done 10-osds-upgrade-jewel/secondhalf.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml new file mode 100644 index 00000000000..b9f02711540 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml @@ -0,0 +1,14 @@ +tasks: +- 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 11-workload/snaps-few-objects.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml b/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml new file mode 100644 index 00000000000..9f52417cf27 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml @@ -0,0 +1,7 @@ +tasks: +- install.upgrade: + osd.0: +- print: "**** done install.upgrade -x osd.0" +- ceph.restart: + daemons: [osd.0, osd.1, osd.2] +- print: "**** done 12-partial-upgrade-x/first.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml b/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml new file mode 100644 index 00000000000..90698cb30e3 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.0: + - rados/load-gen-big.sh +- print: "**** done 13-workload/rados_loadgen_big.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml new file mode 100644 index 00000000000..d83162c8b73 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/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 14-mona-upgrade-x/mona.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml b/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml new file mode 100644 index 00000000000..7e6d43bff07 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml @@ -0,0 +1,8 @@ +tasks: +- workunit: + clients: + client.0: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format +- print: "**** done 15-workload/rbd-import-export.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml new file mode 100644 index 00000000000..91234034eb3 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/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 16-monb-upgrade-x/monb.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml new file mode 100644 index 00000000000..ee49512c42c --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml @@ -0,0 +1,11 @@ +tasks: +- rados: + clients: [client.0] + ops: 4000 + objects: 500 + write_append_excl: false + op_weights: + read: 45 + write: 45 + delete: 10 +- print: "**** done 17-workload/readwrite.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml new file mode 100644 index 00000000000..f708237d63e --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/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" +- ceph.wait_for_mon_quorum: [a, b, c] +- print: "**** done 18-monc-upgrade-x/monc.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml new file mode 100644 index 00000000000..d51088d8356 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml @@ -0,0 +1,33 @@ +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 +- print: "**** done 19-workload/radosbench.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml new file mode 100644 index 00000000000..38f011da88a --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml @@ -0,0 +1,11 @@ +tasks: +- install.upgrade: + osd.3: +- print: "**** done install.upgrade osd.3" +- ceph.restart: + daemons: [osd.3, osd.4, osd.5] +- print: "**** done 20-osds-upgrade-x/osds_secondhalf.yaml" +- 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/stress-split/21-final-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml new file mode 100644 index 00000000000..a164beab513 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.0: + - rados/stress_watch.sh +- print: "**** done 21-final-workload/rados_stress_watch.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml new file mode 100644 index 00000000000..872cf625cde --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.0: + - cls/test_cls_rbd.sh +- print: "**** done 21-final-workload/rbd_cls_tests.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml new file mode 100644 index 00000000000..00a1fac0ce0 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml @@ -0,0 +1,8 @@ +tasks: +- rgw: + client.0: + default_idle_timeout: 300 +- swift: + client.0: + rgw_server: client.0 +- print: "**** done 21-final-workload/rgw-swift.yaml" diff --git a/suites/upgrade/hammer-jewel-x/stress-split/distros b/suites/upgrade/hammer-jewel-x/stress-split/distros new file mode 120000 index 00000000000..79010c36a59 --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/stress-split/distros @@ -0,0 +1 @@ +../../../../distros/supported \ No newline at end of file