From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- qa/suites/rbd/device/% | 0 qa/suites/rbd/device/.qa | 1 + qa/suites/rbd/device/base | 1 + qa/suites/rbd/device/cluster/+ | 0 qa/suites/rbd/device/cluster/.qa | 1 + qa/suites/rbd/device/cluster/fixed-3.yaml | 4 ++++ qa/suites/rbd/device/cluster/openstack.yaml | 1 + qa/suites/rbd/device/conf | 1 + qa/suites/rbd/device/msgr-failures | 1 + qa/suites/rbd/device/objectstore | 1 + qa/suites/rbd/device/supported-random-distro$ | 1 + qa/suites/rbd/device/thrashers | 1 + qa/suites/rbd/device/thrashosds-health.yaml | 1 + qa/suites/rbd/device/workloads/.qa | 1 + qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml | 12 ++++++++++++ qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml | 14 ++++++++++++++ qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml | 14 ++++++++++++++ qa/suites/rbd/device/workloads/rbd_nbd.yaml | 9 +++++++++ .../compare-mirror-image-alternate-primary-krbd.yaml | 13 +++++++++++++ .../compare-mirror-image-alternate-primary-nbd.yaml | 15 +++++++++++++++ .../rbd/mirror/workloads/compare-mirror-images-krbd.yaml | 13 +++++++++++++ .../rbd/mirror/workloads/compare-mirror-images-nbd.yaml | 15 +++++++++++++++ qa/suites/rbd/nbd/% | 0 qa/suites/rbd/nbd/.qa | 1 - qa/suites/rbd/nbd/base | 1 - qa/suites/rbd/nbd/cluster/+ | 0 qa/suites/rbd/nbd/cluster/.qa | 1 - qa/suites/rbd/nbd/cluster/fixed-3.yaml | 4 ---- qa/suites/rbd/nbd/cluster/openstack.yaml | 1 - qa/suites/rbd/nbd/conf | 1 - qa/suites/rbd/nbd/msgr-failures | 1 - qa/suites/rbd/nbd/objectstore | 1 - qa/suites/rbd/nbd/supported-random-distro$ | 1 - qa/suites/rbd/nbd/thrashers | 1 - qa/suites/rbd/nbd/thrashosds-health.yaml | 1 - qa/suites/rbd/nbd/workloads/.qa | 1 - qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml | 14 -------------- qa/suites/rbd/nbd/workloads/rbd_nbd.yaml | 9 --------- qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml | 14 -------------- 39 files changed, 120 insertions(+), 52 deletions(-) create mode 100644 qa/suites/rbd/device/% create mode 120000 qa/suites/rbd/device/.qa create mode 120000 qa/suites/rbd/device/base create mode 100644 qa/suites/rbd/device/cluster/+ create mode 120000 qa/suites/rbd/device/cluster/.qa create mode 100644 qa/suites/rbd/device/cluster/fixed-3.yaml create mode 120000 qa/suites/rbd/device/cluster/openstack.yaml create mode 120000 qa/suites/rbd/device/conf create mode 120000 qa/suites/rbd/device/msgr-failures create mode 120000 qa/suites/rbd/device/objectstore create mode 120000 qa/suites/rbd/device/supported-random-distro$ create mode 120000 qa/suites/rbd/device/thrashers create mode 120000 qa/suites/rbd/device/thrashosds-health.yaml create mode 120000 qa/suites/rbd/device/workloads/.qa create mode 100644 qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml create mode 100644 qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml create mode 100644 qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml create mode 100644 qa/suites/rbd/device/workloads/rbd_nbd.yaml create mode 100644 qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml create mode 100644 qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml create mode 100644 qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml create mode 100644 qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml delete mode 100644 qa/suites/rbd/nbd/% delete mode 120000 qa/suites/rbd/nbd/.qa delete mode 120000 qa/suites/rbd/nbd/base delete mode 100644 qa/suites/rbd/nbd/cluster/+ delete mode 120000 qa/suites/rbd/nbd/cluster/.qa delete mode 100644 qa/suites/rbd/nbd/cluster/fixed-3.yaml delete mode 120000 qa/suites/rbd/nbd/cluster/openstack.yaml delete mode 120000 qa/suites/rbd/nbd/conf delete mode 120000 qa/suites/rbd/nbd/msgr-failures delete mode 120000 qa/suites/rbd/nbd/objectstore delete mode 120000 qa/suites/rbd/nbd/supported-random-distro$ delete mode 120000 qa/suites/rbd/nbd/thrashers delete mode 120000 qa/suites/rbd/nbd/thrashosds-health.yaml delete mode 120000 qa/suites/rbd/nbd/workloads/.qa delete mode 100644 qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml delete mode 100644 qa/suites/rbd/nbd/workloads/rbd_nbd.yaml delete mode 100644 qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml (limited to 'qa/suites/rbd') diff --git a/qa/suites/rbd/device/% b/qa/suites/rbd/device/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rbd/device/.qa b/qa/suites/rbd/device/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/device/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/device/base b/qa/suites/rbd/device/base new file mode 120000 index 000000000..fd10a859d --- /dev/null +++ b/qa/suites/rbd/device/base @@ -0,0 +1 @@ +../thrash/base \ No newline at end of file diff --git a/qa/suites/rbd/device/cluster/+ b/qa/suites/rbd/device/cluster/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rbd/device/cluster/.qa b/qa/suites/rbd/device/cluster/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/device/cluster/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/device/cluster/fixed-3.yaml b/qa/suites/rbd/device/cluster/fixed-3.yaml new file mode 100644 index 000000000..182589152 --- /dev/null +++ b/qa/suites/rbd/device/cluster/fixed-3.yaml @@ -0,0 +1,4 @@ +roles: +- [mon.a, mon.c, osd.0, osd.1, osd.2] +- [mon.b, mgr.x, osd.3, osd.4, osd.5] +- [client.0] diff --git a/qa/suites/rbd/device/cluster/openstack.yaml b/qa/suites/rbd/device/cluster/openstack.yaml new file mode 120000 index 000000000..48becbb83 --- /dev/null +++ b/qa/suites/rbd/device/cluster/openstack.yaml @@ -0,0 +1 @@ +../../thrash/clusters/openstack.yaml \ No newline at end of file diff --git a/qa/suites/rbd/device/conf b/qa/suites/rbd/device/conf new file mode 120000 index 000000000..4bc0fe86c --- /dev/null +++ b/qa/suites/rbd/device/conf @@ -0,0 +1 @@ +.qa/rbd/conf \ No newline at end of file diff --git a/qa/suites/rbd/device/msgr-failures b/qa/suites/rbd/device/msgr-failures new file mode 120000 index 000000000..03689aa44 --- /dev/null +++ b/qa/suites/rbd/device/msgr-failures @@ -0,0 +1 @@ +../thrash/msgr-failures \ No newline at end of file diff --git a/qa/suites/rbd/device/objectstore b/qa/suites/rbd/device/objectstore new file mode 120000 index 000000000..c40bd3261 --- /dev/null +++ b/qa/suites/rbd/device/objectstore @@ -0,0 +1 @@ +.qa/objectstore \ No newline at end of file diff --git a/qa/suites/rbd/device/supported-random-distro$ b/qa/suites/rbd/device/supported-random-distro$ new file mode 120000 index 000000000..0862b4457 --- /dev/null +++ b/qa/suites/rbd/device/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rbd/device/thrashers b/qa/suites/rbd/device/thrashers new file mode 120000 index 000000000..f461dadc3 --- /dev/null +++ b/qa/suites/rbd/device/thrashers @@ -0,0 +1 @@ +../thrash/thrashers \ No newline at end of file diff --git a/qa/suites/rbd/device/thrashosds-health.yaml b/qa/suites/rbd/device/thrashosds-health.yaml new file mode 120000 index 000000000..9124eb1aa --- /dev/null +++ b/qa/suites/rbd/device/thrashosds-health.yaml @@ -0,0 +1 @@ +.qa/tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/rbd/device/workloads/.qa b/qa/suites/rbd/device/workloads/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/device/workloads/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml new file mode 100644 index 000000000..5907718d5 --- /dev/null +++ b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml @@ -0,0 +1,12 @@ +overrides: + install: + ceph: + extra_system_packages: + - pv +tasks: +- workunit: + clients: + all: + - rbd/diff_continuous.sh + env: + RBD_DEVICE_TYPE: "krbd" diff --git a/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml new file mode 100644 index 000000000..e0a7ebe33 --- /dev/null +++ b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml @@ -0,0 +1,14 @@ +overrides: + install: + ceph: + extra_packages: + - rbd-nbd + extra_system_packages: + - pv +tasks: +- workunit: + clients: + client.0: + - rbd/diff_continuous.sh + env: + RBD_DEVICE_TYPE: "nbd" diff --git a/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml new file mode 100644 index 000000000..b5737671f --- /dev/null +++ b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml @@ -0,0 +1,14 @@ +overrides: + install: + ceph: + extra_packages: [rbd-nbd] +tasks: +- rbd_fsx: + clients: [client.0] + ops: 6000 + nbd: True + holebdy: 512 + punch_holes: true + readbdy: 512 + truncbdy: 512 + writebdy: 512 diff --git a/qa/suites/rbd/device/workloads/rbd_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_nbd.yaml new file mode 100644 index 000000000..ededea024 --- /dev/null +++ b/qa/suites/rbd/device/workloads/rbd_nbd.yaml @@ -0,0 +1,9 @@ +overrides: + install: + ceph: + extra_packages: [rbd-nbd] +tasks: +- workunit: + clients: + client.0: + - rbd/rbd-nbd.sh diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml new file mode 100644 index 000000000..771400d01 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml @@ -0,0 +1,13 @@ +overrides: + install: + ceph: + extra_system_packages: + - pv +tasks: +- workunit: + clients: + cluster1.client.mirror: + - rbd/compare_mirror_image_alternate_primary.sh + env: + RBD_DEVICE_TYPE: 'krbd' + timeout: 3h diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml new file mode 100644 index 000000000..e87d0e8ce --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml @@ -0,0 +1,15 @@ +overrides: + install: + ceph: + extra_packages: + - rbd-nbd + extra_system_packages: + - pv +tasks: +- workunit: + clients: + cluster1.client.mirror: + - rbd/compare_mirror_image_alternate_primary.sh + env: + RBD_DEVICE_TYPE: 'nbd' + timeout: 3h diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml new file mode 100644 index 000000000..fc161987f --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml @@ -0,0 +1,13 @@ +overrides: + install: + ceph: + extra_system_packages: + - pv +tasks: +- workunit: + clients: + cluster1.client.mirror: + - rbd/compare_mirror_images.sh + env: + RBD_DEVICE_TYPE: 'krbd' + timeout: 3h diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml new file mode 100644 index 000000000..ed02ed257 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml @@ -0,0 +1,15 @@ +overrides: + install: + ceph: + extra_packages: + - rbd-nbd + extra_system_packages: + - pv +tasks: +- workunit: + clients: + cluster1.client.mirror: + - rbd/compare_mirror_images.sh + env: + RBD_DEVICE_TYPE: 'nbd' + timeout: 3h diff --git a/qa/suites/rbd/nbd/% b/qa/suites/rbd/nbd/% deleted file mode 100644 index e69de29bb..000000000 diff --git a/qa/suites/rbd/nbd/.qa b/qa/suites/rbd/nbd/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/rbd/nbd/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/nbd/base b/qa/suites/rbd/nbd/base deleted file mode 120000 index fd10a859d..000000000 --- a/qa/suites/rbd/nbd/base +++ /dev/null @@ -1 +0,0 @@ -../thrash/base \ No newline at end of file diff --git a/qa/suites/rbd/nbd/cluster/+ b/qa/suites/rbd/nbd/cluster/+ deleted file mode 100644 index e69de29bb..000000000 diff --git a/qa/suites/rbd/nbd/cluster/.qa b/qa/suites/rbd/nbd/cluster/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/rbd/nbd/cluster/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/nbd/cluster/fixed-3.yaml b/qa/suites/rbd/nbd/cluster/fixed-3.yaml deleted file mode 100644 index 182589152..000000000 --- a/qa/suites/rbd/nbd/cluster/fixed-3.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, osd.3, osd.4, osd.5] -- [client.0] diff --git a/qa/suites/rbd/nbd/cluster/openstack.yaml b/qa/suites/rbd/nbd/cluster/openstack.yaml deleted file mode 120000 index 48becbb83..000000000 --- a/qa/suites/rbd/nbd/cluster/openstack.yaml +++ /dev/null @@ -1 +0,0 @@ -../../thrash/clusters/openstack.yaml \ No newline at end of file diff --git a/qa/suites/rbd/nbd/conf b/qa/suites/rbd/nbd/conf deleted file mode 120000 index 4bc0fe86c..000000000 --- a/qa/suites/rbd/nbd/conf +++ /dev/null @@ -1 +0,0 @@ -.qa/rbd/conf \ No newline at end of file diff --git a/qa/suites/rbd/nbd/msgr-failures b/qa/suites/rbd/nbd/msgr-failures deleted file mode 120000 index 03689aa44..000000000 --- a/qa/suites/rbd/nbd/msgr-failures +++ /dev/null @@ -1 +0,0 @@ -../thrash/msgr-failures \ No newline at end of file diff --git a/qa/suites/rbd/nbd/objectstore b/qa/suites/rbd/nbd/objectstore deleted file mode 120000 index c40bd3261..000000000 --- a/qa/suites/rbd/nbd/objectstore +++ /dev/null @@ -1 +0,0 @@ -.qa/objectstore \ No newline at end of file diff --git a/qa/suites/rbd/nbd/supported-random-distro$ b/qa/suites/rbd/nbd/supported-random-distro$ deleted file mode 120000 index 0862b4457..000000000 --- a/qa/suites/rbd/nbd/supported-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rbd/nbd/thrashers b/qa/suites/rbd/nbd/thrashers deleted file mode 120000 index f461dadc3..000000000 --- a/qa/suites/rbd/nbd/thrashers +++ /dev/null @@ -1 +0,0 @@ -../thrash/thrashers \ No newline at end of file diff --git a/qa/suites/rbd/nbd/thrashosds-health.yaml b/qa/suites/rbd/nbd/thrashosds-health.yaml deleted file mode 120000 index 9124eb1aa..000000000 --- a/qa/suites/rbd/nbd/thrashosds-health.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/rbd/nbd/workloads/.qa b/qa/suites/rbd/nbd/workloads/.qa deleted file mode 120000 index a602a0353..000000000 --- a/qa/suites/rbd/nbd/workloads/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml b/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml deleted file mode 100644 index b5737671f..000000000 --- a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml +++ /dev/null @@ -1,14 +0,0 @@ -overrides: - install: - ceph: - extra_packages: [rbd-nbd] -tasks: -- rbd_fsx: - clients: [client.0] - ops: 6000 - nbd: True - holebdy: 512 - punch_holes: true - readbdy: 512 - truncbdy: 512 - writebdy: 512 diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml b/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml deleted file mode 100644 index ededea024..000000000 --- a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml +++ /dev/null @@ -1,9 +0,0 @@ -overrides: - install: - ceph: - extra_packages: [rbd-nbd] -tasks: -- workunit: - clients: - client.0: - - rbd/rbd-nbd.sh diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml b/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml deleted file mode 100644 index e0a7ebe33..000000000 --- a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml +++ /dev/null @@ -1,14 +0,0 @@ -overrides: - install: - ceph: - extra_packages: - - rbd-nbd - extra_system_packages: - - pv -tasks: -- workunit: - clients: - client.0: - - rbd/diff_continuous.sh - env: - RBD_DEVICE_TYPE: "nbd" -- cgit v1.2.3