From 19fcec84d8d7d21e796c7624e521b60d28ee21ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 20:45:59 +0200 Subject: Adding upstream version 16.2.11+ds. Signed-off-by: Daniel Baumann --- qa/suites/upgrade/nautilus-x-singleton/% | 0 qa/suites/upgrade/nautilus-x-singleton/.qa | 1 + qa/suites/upgrade/nautilus-x-singleton/0-cluster/+ | 0 .../upgrade/nautilus-x-singleton/0-cluster/.qa | 1 + .../nautilus-x-singleton/0-cluster/openstack.yaml | 6 ++++ .../nautilus-x-singleton/0-cluster/start.yaml | 39 ++++++++++++++++++++ .../upgrade/nautilus-x-singleton/1-install/.qa | 1 + .../nautilus-x-singleton/1-install/nautilus.yaml | 30 ++++++++++++++++ .../nautilus-x-singleton/2-partial-upgrade/.qa | 1 + .../2-partial-upgrade/firsthalf.yaml | 20 +++++++++++ .../upgrade/nautilus-x-singleton/3-thrash/.qa | 1 + .../nautilus-x-singleton/3-thrash/default.yaml | 22 ++++++++++++ .../upgrade/nautilus-x-singleton/4-workload/+ | 0 .../upgrade/nautilus-x-singleton/4-workload/.qa | 1 + .../nautilus-x-singleton/4-workload/rbd-cls.yaml | 11 ++++++ .../4-workload/rbd-import-export.yaml | 13 +++++++ .../nautilus-x-singleton/4-workload/readwrite.yaml | 17 +++++++++ .../4-workload/snaps-few-objects.yaml | 19 ++++++++++ .../upgrade/nautilus-x-singleton/5-workload/+ | 0 .../upgrade/nautilus-x-singleton/5-workload/.qa | 1 + .../5-workload/radosbench.yaml | 41 ++++++++++++++++++++++ .../nautilus-x-singleton/5-workload/rbd_api.yaml | 11 ++++++ .../nautilus-x-singleton/6-finish-upgrade.yaml | 37 +++++++++++++++++++ .../upgrade/nautilus-x-singleton/7-pacific.yaml | 1 + .../upgrade/nautilus-x-singleton/8-workload/+ | 0 .../upgrade/nautilus-x-singleton/8-workload/.qa | 1 + .../8-workload/rbd-python.yaml | 9 +++++ .../8-workload/snaps-many-objects.yaml | 16 +++++++++ .../nautilus-x-singleton/bluestore-bitmap.yaml | 1 + .../upgrade/nautilus-x-singleton/mon_election | 1 + .../nautilus-x-singleton/thrashosds-health.yaml | 1 + .../upgrade/nautilus-x-singleton/ubuntu_18.04.yaml | 1 + 32 files changed, 304 insertions(+) create mode 100644 qa/suites/upgrade/nautilus-x-singleton/% create mode 120000 qa/suites/upgrade/nautilus-x-singleton/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/0-cluster/+ create mode 120000 qa/suites/upgrade/nautilus-x-singleton/0-cluster/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/1-install/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/4-workload/+ create mode 120000 qa/suites/upgrade/nautilus-x-singleton/4-workload/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-import-export.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/4-workload/readwrite.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/5-workload/+ create mode 120000 qa/suites/upgrade/nautilus-x-singleton/5-workload/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/8-workload/+ create mode 120000 qa/suites/upgrade/nautilus-x-singleton/8-workload/.qa create mode 100644 qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml create mode 100644 qa/suites/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/mon_election create mode 120000 qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml create mode 120000 qa/suites/upgrade/nautilus-x-singleton/ubuntu_18.04.yaml (limited to 'qa/suites/upgrade/nautilus-x-singleton') diff --git a/qa/suites/upgrade/nautilus-x-singleton/% b/qa/suites/upgrade/nautilus-x-singleton/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/upgrade/nautilus-x-singleton/.qa b/qa/suites/upgrade/nautilus-x-singleton/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/+ b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/.qa b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml new file mode 100644 index 000000000..a0d5c2019 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml @@ -0,0 +1,6 @@ +openstack: + - machine: + disk: 100 # GB + - volumes: # attached to each instance + count: 3 + size: 30 # GB diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml new file mode 100644 index 000000000..ee3f97ad5 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml @@ -0,0 +1,39 @@ +meta: +- desc: | + Run ceph on two nodes, + with a separate client-only node. + Use xfs beneath the osds. +overrides: + ceph: + mon_bind_addrvec: false + mon_bind_msgr2: false + fs: xfs + conf: + global: + ms dump corrupt message level: 0 + ms bind msgr2: false + bluestore warn on no per pool omap: false + mon pg warn min per osd: 0 + mds: + debug ms: 1 + debug mds: 20 +roles: +- - mon.a + - mgr.x + - mds.a + - osd.0 + - osd.1 + - osd.2 + - osd.3 +- - mon.b + - mgr.y + - osd.4 + - osd.5 + - osd.6 + - osd.7 +- - mon.c + - osd.8 + - osd.9 + - osd.10 + - osd.11 +- - client.0 diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/.qa b/qa/suites/upgrade/nautilus-x-singleton/1-install/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml new file mode 100644 index 000000000..ecb1035b6 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml @@ -0,0 +1,30 @@ +overrides: + ceph: + log-ignorelist: + - \(MON_DOWN\) + - \(MGR_DOWN\) + - slow request + - Not found or unloadable + - evicting unresponsive client +meta: +- desc: install ceph/nautilus latest +tasks: +- install: + branch: nautilus + exclude_packages: + - ceph-mgr-cephadm + - cephadm +- print: "**** done install nautilus" +- ceph: +- print: "**** done ceph" + +# create a hit set test pool that will generate hit sets prior to octopus +- exec: + mon.a: + - sudo ceph osd pool create test-hit-set-base 32 + - sudo ceph osd pool create test-hit-set-cache 32 + - sudo ceph osd tier add test-hit-set-base test-hit-set-cache + - sudo ceph osd pool set test-hit-set-cache hit_set_type bloom + - sudo ceph osd pool set test-hit-set-cache hit_set_count 32 + - sudo ceph osd pool set test-hit-set-cache hit_set_period 15 + - rados -p test-hit-set-cache bench 30 write -b 1 diff --git a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/.qa b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml new file mode 100644 index 000000000..90c28d46f --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml @@ -0,0 +1,20 @@ +meta: +- desc: | + install upgrade ceph/-x on one node only + 1st half + restart : osd.0,1,2,3,4,5 +tasks: +- install.upgrade: + mon.a: + mon.b: +- print: "**** done install.upgrade osd.0" +- ceph.restart: + daemons: [mgr.x, mgr.y] +- ceph.restart: + daemons: [mon.a, mon.b] + wait-for-healthy: false + mon-health-to-clog: false +- ceph.restart: + daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7] + wait-for-healthy: false +- print: "**** done ceph.restart 1st 2/3s" diff --git a/qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml new file mode 100644 index 000000000..5360e867f --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml @@ -0,0 +1,22 @@ +meta: +- desc: | + randomly kill and revive osd + small chance to increase the number of pgs +overrides: + ceph: + log-ignorelist: + - but it is still running + - objects unfound and apparently lost + - log bound mismatch +tasks: +- parallel: + - split_tasks +split_tasks: + sequential: + - thrashosds: + disable_objectstore_tool_tests: true + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgpnum_fix: 1 + aggressive_pg_num_changes: false + - print: "**** done thrashosds 3-thrash" diff --git a/qa/suites/upgrade/nautilus-x-singleton/4-workload/+ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/upgrade/nautilus-x-singleton/4-workload/.qa b/qa/suites/upgrade/nautilus-x-singleton/4-workload/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml new file mode 100644 index 000000000..31ca77ecc --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml @@ -0,0 +1,11 @@ +meta: +- desc: | + run basic cls tests for rbd +split_tasks: + sequential: + - workunit: + branch: nautilus + clients: + client.0: + - cls/test_cls_rbd.sh + - print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-import-export.yaml new file mode 100644 index 000000000..489ef9b37 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-import-export.yaml @@ -0,0 +1,13 @@ +meta: +- desc: | + run basic import/export cli tests for rbd +split_tasks: + sequential: + - workunit: + branch: nautilus + 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/upgrade/nautilus-x-singleton/4-workload/readwrite.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/readwrite.yaml new file mode 100644 index 000000000..8833d4d87 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/readwrite.yaml @@ -0,0 +1,17 @@ +meta: +- desc: | + randomized correctness test for rados operations on a replicated pool, + using only reads, writes, and deletes +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/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml new file mode 100644 index 000000000..c96cfbe30 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml @@ -0,0 +1,19 @@ +meta: +- desc: | + randomized correctness test for rados operations on a replicated pool with snapshot operations +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/upgrade/nautilus-x-singleton/5-workload/+ b/qa/suites/upgrade/nautilus-x-singleton/5-workload/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/upgrade/nautilus-x-singleton/5-workload/.qa b/qa/suites/upgrade/nautilus-x-singleton/5-workload/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/5-workload/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml b/qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml new file mode 100644 index 000000000..2cfbf1dcf --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml @@ -0,0 +1,41 @@ +meta: +- desc: | + run randomized correctness test for rados operations + generate write load with rados bench +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/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml b/qa/suites/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml new file mode 100644 index 000000000..c221617d6 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml @@ -0,0 +1,11 @@ +meta: +- desc: | + librbd C and C++ api tests +split_tasks: + sequential: + - workunit: + branch: nautilus + clients: + client.0: + - rbd/test_librbd.sh + - print: "**** done rbd/test_librbd.sh 7-workload" diff --git a/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml new file mode 100644 index 000000000..222ba4878 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml @@ -0,0 +1,37 @@ +meta: +- desc: | + install upgrade on remaining node + restartin remaining osds +overrides: + ceph: + log-ignorelist: + - overall HEALTH_ + - \(FS_DEGRADED\) + - \(MDS_ +tasks: +- install.upgrade: + mon.c: +- ceph.restart: + daemons: [mon.c, mgr.x, mgr.y] + wait-for-up: true + wait-for-healthy: false +- ceph.restart: + daemons: [osd.8, osd.9, osd.10, osd.11] + wait-for-up: true + wait-for-healthy: false +- ceph.restart: + daemons: [mds.a] + wait-for-up: true + wait-for-healthy: false +- exec: + mon.a: + - ceph mon enable-msgr2 +- install.upgrade: + client.0: + +# reduce canary pool hit set count from 32 -> 4 and do some io so that +# we are sure they will be trimmed post-upgrade. +- exec: + mon.a: + - sudo ceph osd pool set test-hit-set-cache hit_set_count 4 + - rados -p test-hit-set-cache bench 5 write -b 1 diff --git a/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml b/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml new file mode 120000 index 000000000..1467fc88e --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/7-pacific.yaml @@ -0,0 +1 @@ +.qa/releases/pacific.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/8-workload/+ b/qa/suites/upgrade/nautilus-x-singleton/8-workload/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/upgrade/nautilus-x-singleton/8-workload/.qa b/qa/suites/upgrade/nautilus-x-singleton/8-workload/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/8-workload/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml new file mode 100644 index 000000000..56ba21d7a --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml @@ -0,0 +1,9 @@ +meta: +- desc: | + librbd python api tests +tasks: +- workunit: + clients: + client.0: + - rbd/test_librbd_python.sh +- print: "**** done rbd/test_librbd_python.sh 9-workload" diff --git a/qa/suites/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml new file mode 100644 index 000000000..805bf97c3 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml @@ -0,0 +1,16 @@ +meta: +- desc: | + randomized correctness test for rados operations on a replicated pool with snapshot operations +tasks: +- rados: + clients: [client.0] + ops: 4000 + objects: 500 + write_append_excl: false + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 diff --git a/qa/suites/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml b/qa/suites/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml new file mode 120000 index 000000000..a59cf5175 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/mon_election b/qa/suites/upgrade/nautilus-x-singleton/mon_election new file mode 120000 index 000000000..3f331e621 --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/mon_election @@ -0,0 +1 @@ +.qa/mon_election \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml new file mode 120000 index 000000000..9124eb1aa --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml @@ -0,0 +1 @@ +.qa/tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/nautilus-x-singleton/ubuntu_18.04.yaml b/qa/suites/upgrade/nautilus-x-singleton/ubuntu_18.04.yaml new file mode 120000 index 000000000..cfb85f10e --- /dev/null +++ b/qa/suites/upgrade/nautilus-x-singleton/ubuntu_18.04.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file -- cgit v1.2.3