From 277cc10e144ac94d929d83ee1e85ae5737516c73 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Thu, 10 Jul 2014 14:53:59 -0700 Subject: [PATCH] Added dumpling-firefly-x upgrade suite per http://tracker.ceph.com/issues/8796 Signed-off-by: Yuri Weinstein --- suites/upgrade/dumpling-firefly-x/parallel/% | 0 .../parallel/0-cluster/start.yaml | 19 ++++++++++ .../parallel/1-dumpling-install/dumpling.yaml | 10 ++++++ .../dumpling-firefly-x/parallel/2-workload/+ | 0 .../parallel/2-workload/rados_api.yaml | 8 +++++ .../parallel/2-workload/rados_loadgenbig.yaml | 7 ++++ .../parallel/2-workload/test_rbd_api.yaml | 7 ++++ .../parallel/2-workload/test_rbd_python.yaml | 7 ++++ .../parallel/3-firefly-upgrade/firefly.yaml | 13 +++++++ .../dumpling-firefly-x/parallel/4-workload/+ | 0 .../parallel/4-workload/rados_api.yaml | 8 +++++ .../parallel/4-workload/rados_loadgenbig.yaml | 7 ++++ .../parallel/4-workload/test_rbd_api.yaml | 7 ++++ .../parallel/4-workload/test_rbd_python.yaml | 7 ++++ .../5-upgrade-sequence/upgrade-all.yaml | 8 +++++ .../upgrade-mon-osd-mds.yaml | 35 +++++++++++++++++++ .../parallel/6-final-workload/+ | 0 .../rados-snaps-few-objects.yaml | 12 +++++++ .../6-final-workload/rados_loadgenmix.yaml | 6 ++++ .../6-final-workload/rados_mon_thrash.yaml | 9 +++++ .../parallel/6-final-workload/rbd_cls.yaml | 7 ++++ .../6-final-workload/rbd_import_export.yaml | 8 +++++ .../6-final-workload/rgw_s3tests.yaml | 5 +++ .../parallel/6-final-workload/rgw_swift.yaml | 6 ++++ .../dumpling-firefly-x/parallel/distros | 1 + 25 files changed, 197 insertions(+) create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/% create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/2-workload/+ create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/4-workload/+ create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/+ create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_import_export.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_s3tests.yaml create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml create mode 120000 suites/upgrade/dumpling-firefly-x/parallel/distros diff --git a/suites/upgrade/dumpling-firefly-x/parallel/% b/suites/upgrade/dumpling-firefly-x/parallel/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml new file mode 100644 index 0000000000000..e3d7f85f9ffad --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/0-cluster/start.yaml @@ -0,0 +1,19 @@ +overrides: + ceph: + conf: + mon: + mon warn on legacy crush tunables: false + log-whitelist: + - scrub mismatch + - ScrubResult +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/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml new file mode 100644 index 0000000000000..1de55e7dce968 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml @@ -0,0 +1,10 @@ +tasks: +- install: + branch: dumpling +- print: "**** done dumpling install" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml new file mode 100644 index 0000000000000..96d656e493222 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_api.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rados/test.sh + - cls diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml new file mode 100644 index 0000000000000..16241b3bed642 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/rados_loadgenbig.yaml @@ -0,0 +1,7 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml new file mode 100644 index 0000000000000..7584f0e1ff087 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_api.yaml @@ -0,0 +1,7 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml new file mode 100644 index 0000000000000..09c5326592bd2 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/2-workload/test_rbd_python.yaml @@ -0,0 +1,7 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml new file mode 100644 index 0000000000000..1301a405906a8 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml @@ -0,0 +1,13 @@ +tasks: + - install.upgrade: + mon.a: + branch: firefly + mon.b: + branch: firefly + - print: "**** done install.upgrade" + - ceph.restart: + - print: "**** done restart" + - parallel: + - workload2 + - upgrade-sequence + - print: "**** done parallel" diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml new file mode 100644 index 0000000000000..b6bb42048a442 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml @@ -0,0 +1,8 @@ +workload2: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rados/test.sh + - cls diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml new file mode 100644 index 0000000000000..fd5c31dc4775d --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml @@ -0,0 +1,7 @@ +workload2: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rados/load-gen-big.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml new file mode 100644 index 0000000000000..8c8c97a4bf301 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml @@ -0,0 +1,7 @@ +workload2: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rbd/test_librbd.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml new file mode 100644 index 0000000000000..1edb13cf907b7 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml @@ -0,0 +1,7 @@ +workload2: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rbd/test_librbd_python.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml new file mode 100644 index 0000000000000..da6028e47b25f --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-all.yaml @@ -0,0 +1,8 @@ +upgrade-sequence: + sequential: + - install.upgrade: + mon.a: + branch: emperor + mon.b: + branch: emperor + - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml new file mode 100644 index 0000000000000..b9027db7eea1c --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -0,0 +1,35 @@ +upgrade-sequence: + sequential: + - install.upgrade: + mon.a: + branch: emperor + mon.b: + branch: emperor + - ceph.restart: + daemons: [mon.a] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - ceph.restart: + daemons: [mon.b] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + - ceph.restart: [mon.c] + - sleep: + duration: 60 + - ceph.restart: [osd.0] + - sleep: + duration: 60 + - ceph.restart: [osd.1] + - sleep: + duration: 60 + - ceph.restart: [osd.2] + - sleep: + duration: 60 + - ceph.restart: [osd.3] + - sleep: + duration: 60 + - ceph.restart: [mds.a] diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml new file mode 100644 index 0000000000000..bf85020d8d937 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml @@ -0,0 +1,12 @@ +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 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml new file mode 100644 index 0000000000000..0bddda0ab841d --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml @@ -0,0 +1,6 @@ +tasks: + - workunit: + branch: dumpling + clients: + client.1: + - rados/load-gen-mix.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml new file mode 100644 index 0000000000000..1a932e059f07b --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml @@ -0,0 +1,9 @@ +tasks: +- mon_thrash: + revive_delay: 20 + thrash_delay: 1 +- workunit: + branch: dumpling + clients: + client.1: + - rados/test.sh diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml new file mode 100644 index 0000000000000..9407ab48916b9 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + branch: dumpling + clients: + client.1: + - cls/test_cls_rbd.sh + diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_import_export.yaml new file mode 100644 index 0000000000000..185cd1ab32aae --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_import_export.yaml @@ -0,0 +1,8 @@ +tasks: +- workunit: + branch: dumpling + clients: + client.1: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_s3tests.yaml new file mode 100644 index 0000000000000..22c3a3f821a3c --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_s3tests.yaml @@ -0,0 +1,5 @@ +tasks: +- rgw: [client.1] +- s3tests: + client.1: + rgw_server: client.1 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml new file mode 100644 index 0000000000000..0ab9febd2fc00 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml @@ -0,0 +1,6 @@ +tasks: +# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test. +# - rgw: [client.1] +- swift: + client.1: + rgw_server: client.1 diff --git a/suites/upgrade/dumpling-firefly-x/parallel/distros b/suites/upgrade/dumpling-firefly-x/parallel/distros new file mode 120000 index 0000000000000..79010c36a5998 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-x/parallel/distros @@ -0,0 +1 @@ +../../../../distros/supported \ No newline at end of file -- 2.39.5