From c1f26b330b2dd3db29e8188a2c2d21b466e59d5b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 8 Feb 2017 15:05:15 -0500 Subject: [PATCH] qa/suites/rados/upgrade/jewel-x-singleton: upgrade mons first; box thrasher Signed-off-by: Sage Weil --- .../2-partial-upgrade/firsthalf.yaml | 4 +- .../jewel-x-singleton/3-thrash/default.yaml | 14 ++-- .../upgrade/jewel-x-singleton/4-mon/mona.yaml | 9 --- .../jewel-x-singleton/5-workload/rbd-cls.yaml | 15 ++-- .../5-workload/rbd-import-export.yaml | 19 ++--- .../5-workload/readwrite.yaml | 25 ++++--- .../5-workload/snaps-few-objects.yaml | 31 ++++---- .../jewel-x-singleton/6-next-mon/monb.yaml | 9 --- .../7-workload/radosbench.yaml | 73 ++++++++++--------- .../jewel-x-singleton/7-workload/rbd_api.yaml | 11 +-- .../jewel-x-singleton/8-finish-upgrade.yaml | 9 +++ .../jewel-x-singleton/8-next-mon/monc.yaml | 12 --- 12 files changed, 111 insertions(+), 120 deletions(-) delete mode 100644 qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml delete mode 100644 qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml create mode 100644 qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml delete mode 100644 qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml index ab5dcace9f7..94de7c584b1 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml @@ -8,5 +8,7 @@ tasks: osd.0: - print: "**** done install.upgrade osd.0" - ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5] + daemons: [mon.a, mon.b, mon.c] +- ceph.restart: + daemons: [osd.0, osd.1, osd.2] - print: "**** done ceph.restart 1st half" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml index a600a166a86..d37204ab207 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml @@ -9,8 +9,12 @@ overrides: - objects unfound and apparently lost - log bound mismatch tasks: -- thrashosds: - timeout: 1200 - chance_pgnum_grow: 1 - chance_pgpnum_fix: 1 -- print: "**** done thrashosds 3-thrash" +- parallel: + - split_tasks +split_tasks: + sequential: + - thrashosds: + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgpnum_fix: 1 + - print: "**** done thrashosds 3-thrash" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml deleted file mode 100644 index e3c369dcae3..00000000000 --- a/qa/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: | - restart mon.a so it is upgraded to -x -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.a" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml index 84827e40c84..e35bfc2208d 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml @@ -1,10 +1,11 @@ meta: - desc: | run basic cls tests for rbd -tasks: -- workunit: - branch: jewel - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done cls/test_cls_rbd.sh 5-workload" +split_tasks: + sequential: + - workunit: + branch: jewel + clients: + client.0: + - cls/test_cls_rbd.sh + - print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml index dd3d25f54ef..9d6c2e23296 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml @@ -1,12 +1,13 @@ meta: - desc: | run basic import/export cli tests for rbd -tasks: -- workunit: - branch: jewel - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done rbd/import_export.sh 5-workload" +split_tasks: + sequential: + - workunit: + branch: jewel + clients: + client.0: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format + - print: "**** done rbd/import_export.sh 5-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml index 1b161b4f27e..0382520a09e 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml @@ -2,15 +2,16 @@ meta: - desc: | randomized correctness test for rados operations on a replicated pool, using only reads, writes, and deletes -tasks: -- full_sequential: - - rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done rados/readwrite 5-workload" +split_tasks: + sequential: + - full_sequential: + - rados: + clients: [client.0] + ops: 4000 + objects: 500 + write_append_excl: false + op_weights: + read: 45 + write: 45 + delete: 10 + - print: "**** done rados/readwrite 5-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml index 71445bd6242..c96cfbe3004 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml @@ -1,18 +1,19 @@ meta: - desc: | randomized correctness test for rados operations on a replicated pool with snapshot operations -tasks: -- full_sequential: - - rados: - clients: [client.0] - ops: 4000 - objects: 50 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -- print: "**** done rados/snaps-few-objects 5-workload" +split_tasks: + sequential: + - full_sequential: + - rados: + clients: [client.0] + ops: 4000 + objects: 50 + write_append_excl: false + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 + - print: "**** done rados/snaps-few-objects 5-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml deleted file mode 100644 index ba71c73901a..00000000000 --- a/qa/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml +++ /dev/null @@ -1,9 +0,0 @@ -meta: -- desc: | - restart mon.b so it is upgraded to -x -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.b 6-next-mon" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml index 7d2be5f193b..2cfbf1dcff5 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml @@ -2,39 +2,40 @@ meta: - desc: | run randomized correctness test for rados operations generate write load with rados bench -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done radosbench 7-workload" +split_tasks: + sequential: + - full_sequential: + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - radosbench: + clients: [client.0] + time: 150 + - print: "**** done radosbench 7-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml index 81067e63cfb..22a5f5750d3 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml @@ -1,10 +1,11 @@ meta: - desc: | librbd C and C++ api tests -tasks: -- workunit: - branch: jewel - clients: +split_tasks: + sequential: + - workunit: + branch: jewel + clients: client.0: - rbd/test_librbd.sh -- print: "**** done rbd/test_librbd.sh 7-workload" + - print: "**** done rbd/test_librbd.sh 7-workload" diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml new file mode 100644 index 00000000000..7f1632751e8 --- /dev/null +++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml @@ -0,0 +1,9 @@ +meta: +- desc: | + install upgrade on remaining node + restartin remaining osds +tasks: +- install.upgrade: + osd.3: +- ceph.restart: + daemons: [osd.3, osd.4, osd.5] diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml deleted file mode 100644 index 12788b7b631..00000000000 --- a/qa/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -meta: -- desc: | - restart mon.c so it is upgraded to -x - as all mon were upgrated, expected ceph cluster reach quorum -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c 8-next-mon" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done wait_for_mon_quorum 8-next-mon" -- 2.47.3