From 2ac486d3611471ea3a6b89184439c12fde5eda86 Mon Sep 17 00:00:00 2001 From: tamil Date: Wed, 24 Sep 2014 01:30:24 -0700 Subject: [PATCH] added upgrade suite for dumpling-firefly-giant Signed-off-by: tamil (cherry picked from commit c7603c0b7871477110946d2d47ea67dda1b7a9bf) Conflicts: suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml --- .../upgrade/dumpling-firefly-giant/parallel/% | 0 .../parallel/0-cluster/start.yaml | 19 +++++++++ .../parallel/1-dumpling-install/dumpling.yaml | 9 +++++ .../parallel/2-dumpling-workload/+ | 0 .../2-dumpling-workload/rados_api.yaml | 9 +++++ .../2-dumpling-workload/test_rbd_api.yaml | 8 ++++ .../parallel/3-firefly-upgrade/firefly.yaml | 18 +++++++++ .../parallel/4-firefly-workload/+ | 0 .../4-firefly-workload/rados_loadgenbig.yaml | 8 ++++ .../4-firefly-workload/test_rbd_python.yaml | 8 ++++ .../5-upgrade-to-giant/upgrade-by-daemon.yaml | 40 +++++++++++++++++++ .../5-upgrade-to-giant/upgrade-by-type.yaml | 40 +++++++++++++++++++ .../parallel/6-giant-workload/+ | 0 .../6-giant-workload/ec-rados-default.yaml | 1 + .../ec-rados-plugin=jerasure-k=3-m=1.yaml | 1 + .../rados-snaps-few-objects.yaml | 12 ++++++ .../6-giant-workload/rados_loadgenmix.yaml | 5 +++ .../6-giant-workload/rados_mon_thrash.yaml | 10 +++++ .../parallel/6-giant-workload/rbd_cls.yaml | 6 +++ .../6-giant-workload/rbd_import_export.yaml | 7 ++++ .../6-giant-workload/rgw_s3tests.yaml | 5 +++ .../parallel/6-giant-workload/rgw_swift.yaml | 6 +++ .../dumpling-firefly-giant/parallel/distros | 1 + .../5-upgrade-sequence/upgrade-by-daemon.yaml | 38 ++++++++++++++++++ .../5-upgrade-sequence/upgrade-by-type.yaml | 38 ++++++++++++++++++ 25 files changed, 289 insertions(+) create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/% create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+ create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+ create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+ create mode 120000 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-default.yaml create mode 120000 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml create mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml create mode 120000 suites/upgrade/dumpling-firefly-giant/parallel/distros create mode 100644 suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml create mode 100644 suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/% b/suites/upgrade/dumpling-firefly-giant/parallel/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml new file mode 100644 index 00000000000..e3d7f85f9ff --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/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-giant/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml new file mode 100644 index 00000000000..6396b48a36b --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml @@ -0,0 +1,9 @@ +tasks: +- install: + branch: dumpling +- print: "**** done dumpling install ****" +- ceph: + fs: xfs +- parallel: + - workload +- print: "**** done parallel ****" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml new file mode 100644 index 00000000000..5138ec7ca8a --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml @@ -0,0 +1,9 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rados/test.sh + - cls + - print: "**** done rados/test.sh & cls on dumpling " diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml new file mode 100644 index 00000000000..6a8918e7ed9 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: dumpling + clients: + client.0: + - rbd/test_librbd.sh + - print: "**** done rbd/test_librbd.sh on dumpling" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml new file mode 100644 index 00000000000..7a9bb3666b8 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml @@ -0,0 +1,18 @@ +tasks: + - install.upgrade: + mon.a: + branch: firefly + mon.b: + branch: firefly + client.0: + branch: firefly + - print: "**** done install.upgrade from dumpling to firefly" + - ceph.restart: + - print: "**** done restart" + - parallel: + - workload2 + - upgrade-sequence + - print: "**** done parallel 2" + - install.upgrade: + client.0: + - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml new file mode 100644 index 00000000000..a1ce588794a --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml @@ -0,0 +1,8 @@ +workload2: + sequential: + - workunit: + branch: firefly + clients: + client.0: + - rados/load-gen-big.sh + - print: "**** done rados/load-gen-big.sh on firefly" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml new file mode 100644 index 00000000000..f91e860f593 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml @@ -0,0 +1,8 @@ +workload2: + sequential: + - workunit: + branch: firefly + clients: + client.0: + - rbd/test_librbd_python.sh + - print: "**** done rbd/test_librbd_python.sh on firefly" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml new file mode 100644 index 00000000000..d7d8c84cf47 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml @@ -0,0 +1,40 @@ +upgrade-sequence: + sequential: + - install.upgrade: + mon.a: + branch: giant + - print: "**** done install.upgrade mon.a to giant ****" + - 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 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.a: + - ceph osd crush tunables firefly + - install.upgrade: + mon.b: + branch: giant + - print: "**** done install.upgrade mon.b to giant ****" + - 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 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - exec: + mon.a: + - ceph osd crush tunables firefly diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml new file mode 100644 index 00000000000..ce22c04a61a --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml @@ -0,0 +1,40 @@ +upgrade-sequence: + sequential: + - install.upgrade: + mon.a: + branch: giant + - print: "**** done install.upgrade mon.a to giant" + - 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 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.a: + - ceph osd crush tunables firefly + - install.upgrade: + mon.b: + branch: giant + - print: "**** done install.upgrade mon.b to giant" + - 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 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - exec: + mon.a: + - ceph osd crush tunables firefly diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-default.yaml new file mode 120000 index 00000000000..a8a0ae69405 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-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/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml new file mode 120000 index 00000000000..4b9d9a44a24 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-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/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml new file mode 100644 index 00000000000..bf85020d8d9 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-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-giant/parallel/6-giant-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml new file mode 100644 index 00000000000..879b7b6d189 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml @@ -0,0 +1,5 @@ +tasks: + - workunit: + clients: + client.1: + - rados/load-gen-mix.sh diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml new file mode 100644 index 00000000000..5c4c6297cfe --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml @@ -0,0 +1,10 @@ +tasks: + - sequential: + - mon_thrash: + revive_delay: 20 + thrash_delay: 1 + - workunit: + clients: + client.1: + - rados/test.sh + - print: "**** done rados/test.sh - 6-final-workload" diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml new file mode 100644 index 00000000000..908b79e869a --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + clients: + client.1: + - cls/test_cls_rbd.sh + diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml new file mode 100644 index 00000000000..a7ce2141ee5 --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + clients: + client.1: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml new file mode 100644 index 00000000000..22c3a3f821a --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-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-giant/parallel/6-giant-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml new file mode 100644 index 00000000000..0ab9febd2fc --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-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-giant/parallel/distros b/suites/upgrade/dumpling-firefly-giant/parallel/distros new file mode 120000 index 00000000000..ca99fee94fa --- /dev/null +++ b/suites/upgrade/dumpling-firefly-giant/parallel/distros @@ -0,0 +1 @@ +../../../../distros/supported/ \ No newline at end of file diff --git a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml new file mode 100644 index 00000000000..179f52e4a66 --- /dev/null +++ b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml @@ -0,0 +1,38 @@ +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 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.a: + - ceph osd crush tunables firefly + - 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 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - exec: + mon.a: + - ceph osd crush tunables firefly diff --git a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml new file mode 100644 index 00000000000..179f52e4a66 --- /dev/null +++ b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml @@ -0,0 +1,38 @@ +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 + - print: "**** running mixed versions of osds and mons" + - exec: + mon.a: + - ceph osd crush tunables firefly + - 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 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - exec: + mon.a: + - ceph osd crush tunables firefly