From 5d70d9ca2e434e0b99512f13abde7a69c6d63c76 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 17 Jun 2015 15:22:01 -0700 Subject: [PATCH] Fixes #11570 Removed test_cls_rbd.sh per Josh's suggestion Removed 'branch: hammer' from 3-upgrade-sequence/upgrade-* Signed-off-by: Yuri Weinstein (cherry picked from commit 52fa9a32c8dd5cf527838cd92ca8eec312ab3d41) --- suites/upgrade/hammer/{basic => newer}/% | 0 .../{basic => newer}/0-cluster/start.yaml | 0 .../hammer/newer/1-install/v0.94.2.yaml | 10 ++++++ .../2-workload/blogbench.yaml | 0 .../{basic => newer}/2-workload/rbd.yaml | 0 .../{basic => newer}/2-workload/s3tests.yaml | 0 .../2-workload/testrados.yaml | 0 .../upgrade-mon-osd-mds.yaml | 1 - .../upgrade-osd-mon-mds.yaml | 1 - .../upgrade/hammer/{basic => newer}/4-final/+ | 0 .../{basic => newer}/4-final/monthrash.yaml | 0 .../{basic => newer}/4-final/osdthrash.yaml | 0 .../{basic => newer}/4-final/testrgw.yaml | 0 .../upgrade/hammer/{basic => newer}/distros | 0 suites/upgrade/hammer/older/% | 0 .../upgrade/hammer/older/0-cluster/start.yaml | 20 +++++++++++ .../1-install/latest_giant_release.yaml | 2 +- .../hammer/older/1-install/v0.94.1.yaml | 10 ++++++ .../upgrade/hammer/older/1-install/v0.94.yaml | 10 ++++++ .../hammer/older/2-workload/blogbench.yaml | 7 ++++ .../upgrade/hammer/older/2-workload/rbd.yaml | 9 +++++ .../hammer/older/2-workload/testrados.yaml | 12 +++++++ .../upgrade-mon-osd-mds.yaml | 36 +++++++++++++++++++ .../upgrade-osd-mon-mds.yaml | 36 +++++++++++++++++++ suites/upgrade/hammer/older/4-final/+ | 0 .../hammer/older/4-final/monthrash.yaml | 13 +++++++ .../hammer/older/4-final/osdthrash.yaml | 19 ++++++++++ .../hammer/older/4-final/testrados.yaml | 13 +++++++ suites/upgrade/hammer/older/distros | 1 + 29 files changed, 197 insertions(+), 3 deletions(-) rename suites/upgrade/hammer/{basic => newer}/% (100%) rename suites/upgrade/hammer/{basic => newer}/0-cluster/start.yaml (100%) create mode 100644 suites/upgrade/hammer/newer/1-install/v0.94.2.yaml rename suites/upgrade/hammer/{basic => newer}/2-workload/blogbench.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/2-workload/rbd.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/2-workload/s3tests.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/2-workload/testrados.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/3-upgrade-sequence/upgrade-mon-osd-mds.yaml (96%) rename suites/upgrade/hammer/{basic => newer}/3-upgrade-sequence/upgrade-osd-mon-mds.yaml (96%) rename suites/upgrade/hammer/{basic => newer}/4-final/+ (100%) rename suites/upgrade/hammer/{basic => newer}/4-final/monthrash.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/4-final/osdthrash.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/4-final/testrgw.yaml (100%) rename suites/upgrade/hammer/{basic => newer}/distros (100%) create mode 100644 suites/upgrade/hammer/older/% create mode 100644 suites/upgrade/hammer/older/0-cluster/start.yaml rename suites/upgrade/hammer/{basic => older}/1-install/latest_giant_release.yaml (80%) create mode 100644 suites/upgrade/hammer/older/1-install/v0.94.1.yaml create mode 100644 suites/upgrade/hammer/older/1-install/v0.94.yaml create mode 100644 suites/upgrade/hammer/older/2-workload/blogbench.yaml create mode 100644 suites/upgrade/hammer/older/2-workload/rbd.yaml create mode 100644 suites/upgrade/hammer/older/2-workload/testrados.yaml create mode 100644 suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml create mode 100644 suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml create mode 100644 suites/upgrade/hammer/older/4-final/+ create mode 100644 suites/upgrade/hammer/older/4-final/monthrash.yaml create mode 100644 suites/upgrade/hammer/older/4-final/osdthrash.yaml create mode 100644 suites/upgrade/hammer/older/4-final/testrados.yaml create mode 120000 suites/upgrade/hammer/older/distros diff --git a/suites/upgrade/hammer/basic/% b/suites/upgrade/hammer/newer/% similarity index 100% rename from suites/upgrade/hammer/basic/% rename to suites/upgrade/hammer/newer/% diff --git a/suites/upgrade/hammer/basic/0-cluster/start.yaml b/suites/upgrade/hammer/newer/0-cluster/start.yaml similarity index 100% rename from suites/upgrade/hammer/basic/0-cluster/start.yaml rename to suites/upgrade/hammer/newer/0-cluster/start.yaml diff --git a/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml b/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml new file mode 100644 index 0000000000000..c380658c3a0fd --- /dev/null +++ b/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml @@ -0,0 +1,10 @@ +tasks: +- install: + tag: v0.94.2 +- print: "**** done v0.94.2 install" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel v0.94.2" diff --git a/suites/upgrade/hammer/basic/2-workload/blogbench.yaml b/suites/upgrade/hammer/newer/2-workload/blogbench.yaml similarity index 100% rename from suites/upgrade/hammer/basic/2-workload/blogbench.yaml rename to suites/upgrade/hammer/newer/2-workload/blogbench.yaml diff --git a/suites/upgrade/hammer/basic/2-workload/rbd.yaml b/suites/upgrade/hammer/newer/2-workload/rbd.yaml similarity index 100% rename from suites/upgrade/hammer/basic/2-workload/rbd.yaml rename to suites/upgrade/hammer/newer/2-workload/rbd.yaml diff --git a/suites/upgrade/hammer/basic/2-workload/s3tests.yaml b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml similarity index 100% rename from suites/upgrade/hammer/basic/2-workload/s3tests.yaml rename to suites/upgrade/hammer/newer/2-workload/s3tests.yaml diff --git a/suites/upgrade/hammer/basic/2-workload/testrados.yaml b/suites/upgrade/hammer/newer/2-workload/testrados.yaml similarity index 100% rename from suites/upgrade/hammer/basic/2-workload/testrados.yaml rename to suites/upgrade/hammer/newer/2-workload/testrados.yaml diff --git a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml similarity index 96% rename from suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml rename to suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index fe55b51c777cb..b697e2c9580c6 100644 --- a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,7 +2,6 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: hammer - print: "**** done install.upgrade hammer" - ceph.restart: [mon.a] - sleep: diff --git a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml similarity index 96% rename from suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml rename to suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml index 2835df08d5031..0f773e4690867 100644 --- a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -2,7 +2,6 @@ upgrade-sequence: sequential: - install.upgrade: all: - branch: hammer - print: "**** done install.upgrade hammer" - ceph.restart: [osd.0] - sleep: diff --git a/suites/upgrade/hammer/basic/4-final/+ b/suites/upgrade/hammer/newer/4-final/+ similarity index 100% rename from suites/upgrade/hammer/basic/4-final/+ rename to suites/upgrade/hammer/newer/4-final/+ diff --git a/suites/upgrade/hammer/basic/4-final/monthrash.yaml b/suites/upgrade/hammer/newer/4-final/monthrash.yaml similarity index 100% rename from suites/upgrade/hammer/basic/4-final/monthrash.yaml rename to suites/upgrade/hammer/newer/4-final/monthrash.yaml diff --git a/suites/upgrade/hammer/basic/4-final/osdthrash.yaml b/suites/upgrade/hammer/newer/4-final/osdthrash.yaml similarity index 100% rename from suites/upgrade/hammer/basic/4-final/osdthrash.yaml rename to suites/upgrade/hammer/newer/4-final/osdthrash.yaml diff --git a/suites/upgrade/hammer/basic/4-final/testrgw.yaml b/suites/upgrade/hammer/newer/4-final/testrgw.yaml similarity index 100% rename from suites/upgrade/hammer/basic/4-final/testrgw.yaml rename to suites/upgrade/hammer/newer/4-final/testrgw.yaml diff --git a/suites/upgrade/hammer/basic/distros b/suites/upgrade/hammer/newer/distros similarity index 100% rename from suites/upgrade/hammer/basic/distros rename to suites/upgrade/hammer/newer/distros diff --git a/suites/upgrade/hammer/older/% b/suites/upgrade/hammer/older/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/hammer/older/0-cluster/start.yaml b/suites/upgrade/hammer/older/0-cluster/start.yaml new file mode 100644 index 0000000000000..5f2f97159294d --- /dev/null +++ b/suites/upgrade/hammer/older/0-cluster/start.yaml @@ -0,0 +1,20 @@ +overrides: + ceph: + log-whitelist: + - scrub + - scrub mismatch + - ScrubResult + fs: xfs +roles: +- - mon.a + - mds.a + - osd.0 + - osd.1 + - osd.2 +- - mon.b + - mon.c + - osd.3 + - osd.4 + - osd.5 + - client.0 + - client.1 diff --git a/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml similarity index 80% rename from suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml rename to suites/upgrade/hammer/older/1-install/latest_giant_release.yaml index 0a7b9ec8a8cdf..7bad9da6104ed 100644 --- a/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml +++ b/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml @@ -7,4 +7,4 @@ tasks: - parallel: - workload - upgrade-sequence -- print: "**** done parallel" +- print: "**** done parallel giant" diff --git a/suites/upgrade/hammer/older/1-install/v0.94.1.yaml b/suites/upgrade/hammer/older/1-install/v0.94.1.yaml new file mode 100644 index 0000000000000..f2578e33dc6a2 --- /dev/null +++ b/suites/upgrade/hammer/older/1-install/v0.94.1.yaml @@ -0,0 +1,10 @@ +tasks: +- install: + tag: v0.94.1 +- print: "**** done v0.94.1 install" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel v0.94.1" diff --git a/suites/upgrade/hammer/older/1-install/v0.94.yaml b/suites/upgrade/hammer/older/1-install/v0.94.yaml new file mode 100644 index 0000000000000..7cab6c37f193c --- /dev/null +++ b/suites/upgrade/hammer/older/1-install/v0.94.yaml @@ -0,0 +1,10 @@ +tasks: +- install: + tag: v0.94 +- print: "**** done v0.94 install" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel v0.94" diff --git a/suites/upgrade/hammer/older/2-workload/blogbench.yaml b/suites/upgrade/hammer/older/2-workload/blogbench.yaml new file mode 100644 index 0000000000000..e3d652eafd50d --- /dev/null +++ b/suites/upgrade/hammer/older/2-workload/blogbench.yaml @@ -0,0 +1,7 @@ +workload: + sequential: + - workunit: + clients: + client.0: + - suites/blogbench.sh + - print: "**** done suites/blogbench.sh 2-workload" diff --git a/suites/upgrade/hammer/older/2-workload/rbd.yaml b/suites/upgrade/hammer/older/2-workload/rbd.yaml new file mode 100644 index 0000000000000..5960273bf4b89 --- /dev/null +++ b/suites/upgrade/hammer/older/2-workload/rbd.yaml @@ -0,0 +1,9 @@ +workload: + sequential: + - workunit: + clients: + client.0: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format + - print: "**** done rbd/import_export.sh 2-workload" diff --git a/suites/upgrade/hammer/older/2-workload/testrados.yaml b/suites/upgrade/hammer/older/2-workload/testrados.yaml new file mode 100644 index 0000000000000..49339ecd04410 --- /dev/null +++ b/suites/upgrade/hammer/older/2-workload/testrados.yaml @@ -0,0 +1,12 @@ +workload: + rados: + clients: [client.0] + ops: 2000 + objects: 50 + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 diff --git a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml new file mode 100644 index 0000000000000..b697e2c9580c6 --- /dev/null +++ b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -0,0 +1,36 @@ +upgrade-sequence: + sequential: + - install.upgrade: + all: + - print: "**** done install.upgrade hammer" + - ceph.restart: [mon.a] + - sleep: + duration: 60 + - ceph.restart: [mon.b] + - sleep: + duration: 60 + - ceph.restart: [mon.c] + - sleep: + duration: 60 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - ceph.restart: [osd.0] + - sleep: + duration: 30 + - ceph.restart: [osd.1] + - sleep: + duration: 30 + - ceph.restart: [osd.2] + - sleep: + duration: 30 + - ceph.restart: [osd.3] + - sleep: + duration: 30 + - ceph.restart: [osd.4] + - sleep: + duration: 30 + - ceph.restart: [osd.5] + - sleep: + duration: 30 + - print: "**** done ceph.restart all" diff --git a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml new file mode 100644 index 0000000000000..0f773e4690867 --- /dev/null +++ b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -0,0 +1,36 @@ +upgrade-sequence: + sequential: + - install.upgrade: + all: + - print: "**** done install.upgrade hammer" + - ceph.restart: [osd.0] + - sleep: + duration: 30 + - ceph.restart: [osd.1] + - sleep: + duration: 30 + - ceph.restart: [osd.2] + - sleep: + duration: 30 + - ceph.restart: [osd.3] + - sleep: + duration: 30 + - ceph.restart: [osd.4] + - sleep: + duration: 30 + - ceph.restart: [osd.5] + - sleep: + duration: 60 + - ceph.restart: [mon.a] + - sleep: + duration: 60 + - ceph.restart: [mon.b] + - sleep: + duration: 60 + - ceph.restart: [mon.c] + - sleep: + duration: 60 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - print: "**** done ceph.restart all" diff --git a/suites/upgrade/hammer/older/4-final/+ b/suites/upgrade/hammer/older/4-final/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/hammer/older/4-final/monthrash.yaml b/suites/upgrade/hammer/older/4-final/monthrash.yaml new file mode 100644 index 0000000000000..3774702f08a46 --- /dev/null +++ b/suites/upgrade/hammer/older/4-final/monthrash.yaml @@ -0,0 +1,13 @@ +tasks: +- mon_thrash: + revive_delay: 20 + thrash_delay: 1 +- print: "**** done mon_thrash 4-workload" +- ceph-fuse: +- print: "**** done ceph-fuse 4-workload" +- workunit: + clients: + client.0: + - suites/dbench.sh +- print: "**** done suites/dbench.sh 4-workload" + diff --git a/suites/upgrade/hammer/older/4-final/osdthrash.yaml b/suites/upgrade/hammer/older/4-final/osdthrash.yaml new file mode 100644 index 0000000000000..b5acf43581435 --- /dev/null +++ b/suites/upgrade/hammer/older/4-final/osdthrash.yaml @@ -0,0 +1,19 @@ +overrides: + ceph: + log-whitelist: + - wrongly marked me down + - objects unfound and apparently lost + - log bound mismatch +tasks: +- sequential: + - thrashosds: + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgpnum_fix: 1 + - print: "**** done thrashosds 4-workload" + - workunit: + clients: + client.0: + - suites/iogen.sh + - print: "**** done suites/iogen.sh 4-workload" + diff --git a/suites/upgrade/hammer/older/4-final/testrados.yaml b/suites/upgrade/hammer/older/4-final/testrados.yaml new file mode 100644 index 0000000000000..71865207eb021 --- /dev/null +++ b/suites/upgrade/hammer/older/4-final/testrados.yaml @@ -0,0 +1,13 @@ +tasks: +- sequential: + - rados: + clients: [client.0] + ops: 2000 + objects: 50 + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 diff --git a/suites/upgrade/hammer/older/distros b/suites/upgrade/hammer/older/distros new file mode 120000 index 0000000000000..ca99fee94fa84 --- /dev/null +++ b/suites/upgrade/hammer/older/distros @@ -0,0 +1 @@ +../../../../distros/supported/ \ No newline at end of file -- 2.39.5