From f34f96dc4a2b26fb6106a3e93734453ede8117aa Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Tue, 30 Jul 2019 12:57:00 -0700 Subject: [PATCH] qa/tests: added rgw into upgrade sequence to improve coverage added rgw into upgrade sequence to improve coverage - splits See https://github.com/ceph/ceph/pull/29234 https://github.com/ceph/ceph/pull/29282 Signed-off-by: Yuri Weinstein --- .../parallel/1-ceph-install/mimic.yaml | 3 +++ .../2-workload/rgw_ragweed_prepare.yaml | 2 -- .../3-upgrade-sequence/upgrade-all.yaml | 2 +- .../upgrade-mon-osd-mds.yaml | 19 ++++++++++++++++--- .../parallel/5-final-workload/rgw.yaml | 3 +-- .../stress-split/1-ceph-install/mimic.yaml | 3 +++ .../4-workload/rgw_ragweed_prepare.yaml | 2 -- .../stress-split/5-finish-upgrade.yaml | 5 +++-- .../rgw-swift-ragweed_check.yaml | 3 --- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml index 6c9bd0d2160c..e2807604746d 100644 --- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml @@ -44,6 +44,9 @@ tasks: mon.b: mon.c: - print: "**** done install.upgrade non-client hosts" +- rgw: + - client.1 +- print: "**** done => started rgw client.1" - parallel: - workload - upgrade-sequence diff --git a/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml index ab68649008bf..7c8dd21a2a12 100644 --- a/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml @@ -4,8 +4,6 @@ meta: workload: full_sequential: - sequential: - - rgw: - - client.1 - ragweed: client.1: default-branch: ceph-master diff --git a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 15a3271fe8c4..6f27c2bc970e 100644 --- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -16,7 +16,7 @@ upgrade-sequence: wait-for-healthy: false wait-for-osds-up: true - ceph.restart: - daemons: [mds.a, mds.b] + daemons: [mds.a, mds.b,rgw.*] wait-for-healthy: false wait-for-osds-up: true - print: "**** done ceph.restart all" diff --git a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index cf8b716440e4..d4f1ee8d7d89 100644 --- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -2,8 +2,14 @@ meta: - desc: | upgrade the ceph cluster, upgrate in two steps - step one ordering: mon.a, osd.0, osd.1, mds.a - step two ordering: mon.b, mon.c, osd.2, osd.3 + step one ordering: mon.a + step two ordering: mon.b,mgr.x + step three ordering: mon.c + step four ordering: osd.0, osd.1 + step five ordering: mds.a, msd.b + step six ordering: osd.4, osd.5 + step seven ordering: osd.2, osd.3 + step eight ordering: rgw.* ceph expected to be healthy state after each step upgrade-sequence: sequential: @@ -13,7 +19,7 @@ upgrade-sequence: - sleep: duration: 60 - ceph.restart: - daemons: [mon.b, mgr.x] + daemons: [mon.b, mgr.x,rgw.*] wait-for-healthy: true mon-health-to-clog: false - sleep: @@ -49,3 +55,10 @@ upgrade-sequence: wait-for-osds-up: true - sleep: duration: 60 + - ceph.restart: + daemons: [rgw.*] + wait-for-healthy: false + wait-for-osds-up: true + - sleep: + duration: 60 + diff --git a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml index 00855dc5606e..de9599472903 100644 --- a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml @@ -3,6 +3,5 @@ overrides: frontend: civetweb tasks: - sequential: - - rgw: [client.1] - - print: "**** done rgw 4-final-workload" - rgw-final-workload + - print: "**** done rgw 4-final-workload" diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml index ad5b0e236101..b1fe5f92597d 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml @@ -21,6 +21,9 @@ tasks: - ceph osd require-osd-release mimic - ceph osd set-require-min-compat-client mimic - print: "**** done ceph" +- rgw: + - client.0 +- print: "**** done => started rgw client.0" overrides: ceph: conf: diff --git a/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml index b1f06bcc9625..8adde7ef570a 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml @@ -4,8 +4,6 @@ meta: stress-tasks: - full_sequential: - sequential: - - rgw: - - client.0 - ragweed: client.0: default-branch: ceph-nautilus diff --git a/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml index a76cda76fbae..bbaaad60c498 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml @@ -3,12 +3,13 @@ tasks: osd.8: client.0: - ceph.restart: - daemons: [osd.8, osd.9, osd.10, osd.11] + daemons: [osd.8, osd.9, osd.10, osd.11,rgw.*] wait-for-healthy: false wait-for-osds-up: true +- print: "**** done restarted/upgraded => osd.8, osd.9, osd.10, osd.11, rgw.*" - exec: osd.0: - ceph osd set pglog_hardlimit - ceph osd dump --format=json-pretty | grep "flags" -- print: "**** try to set pglog_hardlimit again, should succeed" +- print: "**** done try to set pglog_hardlimit again, should succeed" diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml index 39734ef8571b..734a5f494a0d 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml @@ -3,9 +3,6 @@ meta: swift api tests for rgw rgw ragweed check after upgrade tasks: -- rgw: - client.0: -- print: "**** done rgw 7-workload" - swift: client.0: rgw_server: client.0 -- 2.47.3