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/krbd/unmap/% | 0 qa/suites/krbd/unmap/.qa | 1 + qa/suites/krbd/unmap/ceph/.qa | 1 + qa/suites/krbd/unmap/ceph/ceph.yaml | 16 ++++++++++++++++ qa/suites/krbd/unmap/clusters/.qa | 1 + qa/suites/krbd/unmap/clusters/separate-client.yaml | 16 ++++++++++++++++ qa/suites/krbd/unmap/conf.yaml | 5 +++++ qa/suites/krbd/unmap/filestore-xfs.yaml | 1 + qa/suites/krbd/unmap/kernels/.qa | 1 + qa/suites/krbd/unmap/kernels/pre-single-major.yaml | 10 ++++++++++ qa/suites/krbd/unmap/kernels/single-major-off.yaml | 6 ++++++ qa/suites/krbd/unmap/kernels/single-major-on.yaml | 6 ++++++ qa/suites/krbd/unmap/tasks/.qa | 1 + qa/suites/krbd/unmap/tasks/unmap.yaml | 5 +++++ 14 files changed, 70 insertions(+) create mode 100644 qa/suites/krbd/unmap/% create mode 120000 qa/suites/krbd/unmap/.qa create mode 120000 qa/suites/krbd/unmap/ceph/.qa create mode 100644 qa/suites/krbd/unmap/ceph/ceph.yaml create mode 120000 qa/suites/krbd/unmap/clusters/.qa create mode 100644 qa/suites/krbd/unmap/clusters/separate-client.yaml create mode 100644 qa/suites/krbd/unmap/conf.yaml create mode 120000 qa/suites/krbd/unmap/filestore-xfs.yaml create mode 120000 qa/suites/krbd/unmap/kernels/.qa create mode 100644 qa/suites/krbd/unmap/kernels/pre-single-major.yaml create mode 100644 qa/suites/krbd/unmap/kernels/single-major-off.yaml create mode 100644 qa/suites/krbd/unmap/kernels/single-major-on.yaml create mode 120000 qa/suites/krbd/unmap/tasks/.qa create mode 100644 qa/suites/krbd/unmap/tasks/unmap.yaml (limited to 'qa/suites/krbd/unmap') diff --git a/qa/suites/krbd/unmap/% b/qa/suites/krbd/unmap/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/krbd/unmap/.qa b/qa/suites/krbd/unmap/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/krbd/unmap/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/unmap/ceph/.qa b/qa/suites/krbd/unmap/ceph/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/krbd/unmap/ceph/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/unmap/ceph/ceph.yaml b/qa/suites/krbd/unmap/ceph/ceph.yaml new file mode 100644 index 000000000..c33664028 --- /dev/null +++ b/qa/suites/krbd/unmap/ceph/ceph.yaml @@ -0,0 +1,16 @@ +overrides: + ceph: + crush_tunables: bobtail + mon_bind_addrvec: false + mon_bind_msgr2: false + conf: + global: + cephx require version: 1 + cephx service require version: 1 + ms bind msgr2: false +tasks: +- install: +- ceph: +- exec: + client.0: + - "ceph osd getcrushmap -o /dev/stdout | crushtool -d - | sed -e 's/alg straw2/alg straw/g' | crushtool -c /dev/stdin -o /dev/stdout | ceph osd setcrushmap -i /dev/stdin" diff --git a/qa/suites/krbd/unmap/clusters/.qa b/qa/suites/krbd/unmap/clusters/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/krbd/unmap/clusters/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/unmap/clusters/separate-client.yaml b/qa/suites/krbd/unmap/clusters/separate-client.yaml new file mode 100644 index 000000000..be1343189 --- /dev/null +++ b/qa/suites/krbd/unmap/clusters/separate-client.yaml @@ -0,0 +1,16 @@ +# fixed-1.yaml, but with client.0 on a separate target +overrides: + ceph-deploy: + conf: + global: + osd pool default size: 2 + osd crush chooseleaf type: 0 + osd pool default pg num: 128 + osd pool default pgp num: 128 +roles: +- [mon.a, mgr.x, osd.0, osd.1, osd.2] +- [client.0] +openstack: +- volumes: # attached to each instance + count: 3 + size: 10 # GB diff --git a/qa/suites/krbd/unmap/conf.yaml b/qa/suites/krbd/unmap/conf.yaml new file mode 100644 index 000000000..8984e8dc8 --- /dev/null +++ b/qa/suites/krbd/unmap/conf.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd default features: 1 # pre-single-major is v3.13, so layering only diff --git a/qa/suites/krbd/unmap/filestore-xfs.yaml b/qa/suites/krbd/unmap/filestore-xfs.yaml new file mode 120000 index 000000000..41f2a9d14 --- /dev/null +++ b/qa/suites/krbd/unmap/filestore-xfs.yaml @@ -0,0 +1 @@ +.qa/objectstore/filestore-xfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/unmap/kernels/.qa b/qa/suites/krbd/unmap/kernels/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/krbd/unmap/kernels/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/unmap/kernels/pre-single-major.yaml b/qa/suites/krbd/unmap/kernels/pre-single-major.yaml new file mode 100644 index 000000000..a5636b45e --- /dev/null +++ b/qa/suites/krbd/unmap/kernels/pre-single-major.yaml @@ -0,0 +1,10 @@ +overrides: + kernel: + client.0: + branch: nightly_pre-single-major # v3.12.z +tasks: +- exec: + client.0: + - "modprobe -r rbd" + - "modprobe --first-time rbd" + - "test ! -f /sys/module/rbd/parameters/single_major" diff --git a/qa/suites/krbd/unmap/kernels/single-major-off.yaml b/qa/suites/krbd/unmap/kernels/single-major-off.yaml new file mode 100644 index 000000000..9dc2488ef --- /dev/null +++ b/qa/suites/krbd/unmap/kernels/single-major-off.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + client.0: + - "modprobe -r rbd" + - "modprobe --first-time rbd single_major=0" + - "grep -q N /sys/module/rbd/parameters/single_major" diff --git a/qa/suites/krbd/unmap/kernels/single-major-on.yaml b/qa/suites/krbd/unmap/kernels/single-major-on.yaml new file mode 100644 index 000000000..c3889f34a --- /dev/null +++ b/qa/suites/krbd/unmap/kernels/single-major-on.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + client.0: + - "modprobe -r rbd" + - "modprobe --first-time rbd single_major=1" + - "grep -q Y /sys/module/rbd/parameters/single_major" diff --git a/qa/suites/krbd/unmap/tasks/.qa b/qa/suites/krbd/unmap/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/krbd/unmap/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/unmap/tasks/unmap.yaml b/qa/suites/krbd/unmap/tasks/unmap.yaml new file mode 100644 index 000000000..435061b45 --- /dev/null +++ b/qa/suites/krbd/unmap/tasks/unmap.yaml @@ -0,0 +1,5 @@ +tasks: +- cram: + clients: + client.0: + - src/test/cli-integration/rbd/unmap.t -- cgit v1.2.3