From 836921e07d8b2388c42d667d2dd48e3e0933a79e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 1 Dec 2016 18:09:11 -0500 Subject: [PATCH] upgrade/hammer-jewel-x: misc fixes --- .../hammer-jewel-x/parallel/0-cluster/start.yaml | 2 ++ .../1-hammer-jewel-install/hammer-jewel.yaml | 6 ++++-- .../upgrade/hammer-jewel-x/parallel/3.5-finish.yaml | 5 +++++ .../5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml | 12 +++++++++--- .../parallel/6-workload/ec-rados-default.yaml | 7 ++++++- .../parallel/6-workload/rados_api.yaml | 2 +- .../parallel/6-workload/rados_loadgenbig.yaml | 2 +- .../parallel/6-workload/test_rbd_api.yaml | 2 +- .../parallel/6-workload/test_rbd_python.yaml | 2 +- .../parallel/7-upgrade-sequence/upgrade-all.yaml | 2 +- .../7-upgrade-sequence/upgrade-by-daemon.yaml | 2 +- 11 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml diff --git a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml index 25cc17f0a33..77c781fc477 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml @@ -4,6 +4,8 @@ overrides: mon: mon warn on legacy crush tunables: false mon debug unsafe allow tier with nonempty snaps: true + log-whitelist: + - wrongly marked me down roles: - - mon.a - osd.0 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 index 19d36b07d24..01dc9fa6dd4 100644 --- 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 @@ -6,9 +6,11 @@ tasks: - ceph: fs: xfs - install.upgrade: - client.0: + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] + osd.0: + branch: jewel + osd.2: branch: jewel - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] - print: "*** client.0 upgraded packages to jewel" - parallel: - workload diff --git a/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml b/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml new file mode 100644 index 00000000000..60a3cb6df2d --- /dev/null +++ b/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml @@ -0,0 +1,5 @@ +tasks: +- install.upgrade: + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] + client.0: + branch: jewel diff --git a/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml index 37a880b52b4..ab41db6d172 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml @@ -1,8 +1,14 @@ tasks: + - install.upgrade: + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] + client.0: + branch: jewel + - print: "**** done install.upgrade client.0 to jewel" + - install.upgrade: + osd.0: + osd.2: + - print: "**** done install.upgrade daemons to x" - 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/6-workload/ec-rados-default.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml index 5c5a958804e..15168a18648 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml @@ -2,9 +2,14 @@ meta: - desc: | run run randomized correctness test for rados operations on an erasure-coded pool -workload: +workload2: full_sequential: - rados: + erasure_code_profile: + name: teuthologyprofile2 + k: 2 + m: 1 + ruleset-failure-domain: osd clients: [client.0] ops: 4000 objects: 50 diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml index 348f1aed941..088976b3929 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml @@ -1,7 +1,7 @@ meta: - desc: | object class functional tests -workload: +workload2: full_sequential: - workunit: branch: jewel diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml index a91ed2cfa85..30f13077be3 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml @@ -1,7 +1,7 @@ meta: - desc: | generate read/write load with rados objects ranging from 1MB to 25MB -workload: +workload2: full_sequential: - workunit: branch: jewel diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml index 15d892e200f..e21839b04b1 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml @@ -1,7 +1,7 @@ meta: - desc: | librbd C and C++ api tests -workload: +workload2: full_sequential: - workunit: branch: jewel diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml index bb2d3eac802..cae2c0600a6 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml @@ -1,7 +1,7 @@ meta: - desc: | librbd python api tests -workload: +workload2: full_sequential: - workunit: branch: jewel diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml index 76d474d8594..ddbb9ff4373 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml @@ -1,7 +1,7 @@ meta: - desc: | upgrade the ceph cluster -upgrade-sequence: +upgrade-sequence2: sequential: - ceph.restart: daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml index 42ba47ddab6..f59a152dc90 100644 --- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml +++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml @@ -5,7 +5,7 @@ meta: step one ordering: mon.a, osd.0, osd.1 step two ordering: mon.b, mon.c, osd.2, osd.3 ceph expected to be healthy state after each step -upgrade-sequence: +upgrade-sequence2: sequential: - ceph.restart: daemons: [mon.a]