From: Ilya Dryomov Date: Sun, 24 Apr 2022 15:28:53 +0000 (+0200) Subject: qa/suites/rbd: refactor persistent-writeback-cache suite X-Git-Tag: v16.2.11~103^2~55^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a1daf93a766aca02049dd61a699ae178b308c206;p=ceph.git qa/suites/rbd: refactor persistent-writeback-cache suite Rename to pwl-cache, introduce home subdirectory and 4-cache-path.yaml. No functional changes. Signed-off-by: Ilya Dryomov (cherry picked from commit 3475f9ef07af22c2efc427546d01dff3176f9240) Conflicts: qa/suites/rbd/pwl-cache/home/2-cluster/.qa [ commit 1f714da81440 ("qa: fix or add missing .qa links") not in pacific ] qa/suites/rbd/pwl-cache/home/5-cache-mode/.qa [ ditto ] --- diff --git a/qa/suites/rbd/persistent-writeback-cache/% b/qa/suites/rbd/persistent-writeback-cache/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/rbd/persistent-writeback-cache/.qa b/qa/suites/rbd/persistent-writeback-cache/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/persistent-writeback-cache/1-base b/qa/suites/rbd/persistent-writeback-cache/1-base deleted file mode 120000 index fd10a859de29f..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/1-base +++ /dev/null @@ -1 +0,0 @@ -../thrash/base \ No newline at end of file diff --git a/qa/suites/rbd/persistent-writeback-cache/2-cluster/+ b/qa/suites/rbd/persistent-writeback-cache/2-cluster/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/rbd/persistent-writeback-cache/2-cluster/.qa b/qa/suites/rbd/persistent-writeback-cache/2-cluster/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/2-cluster/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/persistent-writeback-cache/2-cluster/fix-2.yaml b/qa/suites/rbd/persistent-writeback-cache/2-cluster/fix-2.yaml deleted file mode 100644 index dbccecbceaafd..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/2-cluster/fix-2.yaml +++ /dev/null @@ -1,3 +0,0 @@ -roles: -- [mon.a, mgr.x, osd.0, osd.1] -- [mon.b, mgr.y, osd.2, osd.3, client.0] diff --git a/qa/suites/rbd/persistent-writeback-cache/2-cluster/openstack.yaml b/qa/suites/rbd/persistent-writeback-cache/2-cluster/openstack.yaml deleted file mode 100644 index b113e4f2ef7f6..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/2-cluster/openstack.yaml +++ /dev/null @@ -1,4 +0,0 @@ -openstack: - - volumes: # attached to each instance - count: 4 - size: 10 # GB diff --git a/qa/suites/rbd/persistent-writeback-cache/3-supported-random-distro$ b/qa/suites/rbd/persistent-writeback-cache/3-supported-random-distro$ deleted file mode 120000 index 0862b4457b37a..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/3-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/persistent-writeback-cache/4-pool/big-cache.yaml b/qa/suites/rbd/persistent-writeback-cache/4-pool/big-cache.yaml deleted file mode 100644 index 7ac3f31da0ce4..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/4-pool/big-cache.yaml +++ /dev/null @@ -1,15 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd_persistent_cache_path: /home/ubuntu/cephtest/write_back_cache - rbd_persistent_cache_size: 8589934592 - rbd_plugins: pwl_cache - rbd_default_features: 61 -tasks: -- exec: - client.0: - - "mkdir -m 777 /home/ubuntu/cephtest/write_back_cache" -- exec_on_cleanup: - client.0: - - "rm -rf /home/ubuntu/cephtest/write_back_cache" diff --git a/qa/suites/rbd/persistent-writeback-cache/4-pool/cache.yaml b/qa/suites/rbd/persistent-writeback-cache/4-pool/cache.yaml deleted file mode 100644 index 9265e7dd89d71..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/4-pool/cache.yaml +++ /dev/null @@ -1,15 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd_persistent_cache_path: /home/ubuntu/cephtest/write_back_cache - rbd_persistent_cache_size: 1073741824 - rbd_plugins: pwl_cache - rbd_default_features: 61 -tasks: -- exec: - client.0: - - "mkdir -m 777 /home/ubuntu/cephtest/write_back_cache" -- exec_on_cleanup: - client.0: - - "rm -rf /home/ubuntu/cephtest/write_back_cache" diff --git a/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/rwl.yaml b/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/rwl.yaml deleted file mode 100644 index 5aeab26b34947..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/rwl.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd_persistent_cache_mode: rwl diff --git a/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/ssd.yaml b/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/ssd.yaml deleted file mode 100644 index 0821491471da9..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/5-cache-mode/ssd.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd_persistent_cache_mode: ssd diff --git a/qa/suites/rbd/persistent-writeback-cache/6-workloads/.qa b/qa/suites/rbd/persistent-writeback-cache/6-workloads/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/6-workloads/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/persistent-writeback-cache/6-workloads/c_api_tests_with_defaults.yaml b/qa/suites/rbd/persistent-writeback-cache/6-workloads/c_api_tests_with_defaults.yaml deleted file mode 120000 index 9490327251bed..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/6-workloads/c_api_tests_with_defaults.yaml +++ /dev/null @@ -1 +0,0 @@ -../../librbd/workloads/c_api_tests_with_defaults.yaml \ No newline at end of file diff --git a/qa/suites/rbd/persistent-writeback-cache/6-workloads/fio.yaml b/qa/suites/rbd/persistent-writeback-cache/6-workloads/fio.yaml deleted file mode 100644 index f7aecce8aeb1d..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/6-workloads/fio.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rbd_fio: - client.0: - fio-io-size: 100% - formats: [2] - io-engine: rbd - rw: randwrite - runtime: 600 diff --git a/qa/suites/rbd/persistent-writeback-cache/6-workloads/qemu_xfstests.yaml b/qa/suites/rbd/persistent-writeback-cache/6-workloads/qemu_xfstests.yaml deleted file mode 100644 index 255b9631e39f8..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/6-workloads/qemu_xfstests.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- qemu: - client.0: - test: qa/run_xfstests_qemu.sh - type: block - cpus: 4 - memory: 4096 - disks: 3 diff --git a/qa/suites/rbd/persistent-writeback-cache/6-workloads/recovery.yaml b/qa/suites/rbd/persistent-writeback-cache/6-workloads/recovery.yaml deleted file mode 100644 index 63a0c9dcf2558..0000000000000 --- a/qa/suites/rbd/persistent-writeback-cache/6-workloads/recovery.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: -- rbd.create_image: - client.0: - image_name: testimage - image_size: 10 - image_format: 2 -- exec: - client.0: - - "timeout 10s rbd bench --io-pattern rand --io-type write testimage || true" - - "rbd bench --io-type write --io-pattern rand --io-total 32M testimage" diff --git a/qa/suites/rbd/pwl-cache/.qa b/qa/suites/rbd/pwl-cache/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/% b/qa/suites/rbd/pwl-cache/home/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rbd/pwl-cache/home/.qa b/qa/suites/rbd/pwl-cache/home/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/1-base b/qa/suites/rbd/pwl-cache/home/1-base new file mode 120000 index 0000000000000..89c3c7e845f7f --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/1-base @@ -0,0 +1 @@ +../../basic/base/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/2-cluster/+ b/qa/suites/rbd/pwl-cache/home/2-cluster/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rbd/pwl-cache/home/2-cluster/.qa b/qa/suites/rbd/pwl-cache/home/2-cluster/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/2-cluster/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/2-cluster/fix-2.yaml b/qa/suites/rbd/pwl-cache/home/2-cluster/fix-2.yaml new file mode 100644 index 0000000000000..dbccecbceaafd --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/2-cluster/fix-2.yaml @@ -0,0 +1,3 @@ +roles: +- [mon.a, mgr.x, osd.0, osd.1] +- [mon.b, mgr.y, osd.2, osd.3, client.0] diff --git a/qa/suites/rbd/pwl-cache/home/2-cluster/openstack.yaml b/qa/suites/rbd/pwl-cache/home/2-cluster/openstack.yaml new file mode 100644 index 0000000000000..b113e4f2ef7f6 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/2-cluster/openstack.yaml @@ -0,0 +1,4 @@ +openstack: + - volumes: # attached to each instance + count: 4 + size: 10 # GB diff --git a/qa/suites/rbd/pwl-cache/home/3-supported-random-distro$ b/qa/suites/rbd/pwl-cache/home/3-supported-random-distro$ new file mode 120000 index 0000000000000..0862b4457b37a --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/3-supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/4-cache-path.yaml b/qa/suites/rbd/pwl-cache/home/4-cache-path.yaml new file mode 100644 index 0000000000000..be4641b019d6c --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/4-cache-path.yaml @@ -0,0 +1,13 @@ +overrides: + ceph: + conf: + client: + rbd_persistent_cache_path: /home/ubuntu/cephtest/rbd-pwl-cache + rbd_plugins: pwl_cache +tasks: +- exec: + client.0: + - "mkdir -m 777 /home/ubuntu/cephtest/rbd-pwl-cache" +- exec_on_cleanup: + client.0: + - "rm -rf /home/ubuntu/cephtest/rbd-pwl-cache" diff --git a/qa/suites/rbd/pwl-cache/home/5-cache-mode/.qa b/qa/suites/rbd/pwl-cache/home/5-cache-mode/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/5-cache-mode/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/5-cache-mode/rwl.yaml b/qa/suites/rbd/pwl-cache/home/5-cache-mode/rwl.yaml new file mode 100644 index 0000000000000..5aeab26b34947 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/5-cache-mode/rwl.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd_persistent_cache_mode: rwl diff --git a/qa/suites/rbd/pwl-cache/home/5-cache-mode/ssd.yaml b/qa/suites/rbd/pwl-cache/home/5-cache-mode/ssd.yaml new file mode 100644 index 0000000000000..0821491471da9 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/5-cache-mode/ssd.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd_persistent_cache_mode: ssd diff --git a/qa/suites/rbd/pwl-cache/home/6-cache-size/.qa b/qa/suites/rbd/pwl-cache/home/6-cache-size/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/6-cache-size/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/6-cache-size/1G.yaml b/qa/suites/rbd/pwl-cache/home/6-cache-size/1G.yaml new file mode 100644 index 0000000000000..53fcddcdfa8d7 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/6-cache-size/1G.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd_persistent_cache_size: 1073741824 diff --git a/qa/suites/rbd/pwl-cache/home/6-cache-size/8G.yaml b/qa/suites/rbd/pwl-cache/home/6-cache-size/8G.yaml new file mode 100644 index 0000000000000..b53d368529514 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/6-cache-size/8G.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rbd_persistent_cache_size: 8589934592 diff --git a/qa/suites/rbd/pwl-cache/home/7-workloads/.qa b/qa/suites/rbd/pwl-cache/home/7-workloads/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/7-workloads/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/7-workloads/c_api_tests_with_defaults.yaml b/qa/suites/rbd/pwl-cache/home/7-workloads/c_api_tests_with_defaults.yaml new file mode 120000 index 0000000000000..359001f8f55f1 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/7-workloads/c_api_tests_with_defaults.yaml @@ -0,0 +1 @@ +../../../librbd/workloads/c_api_tests_with_defaults.yaml \ No newline at end of file diff --git a/qa/suites/rbd/pwl-cache/home/7-workloads/fio.yaml b/qa/suites/rbd/pwl-cache/home/7-workloads/fio.yaml new file mode 100644 index 0000000000000..f7aecce8aeb1d --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/7-workloads/fio.yaml @@ -0,0 +1,8 @@ +tasks: +- rbd_fio: + client.0: + fio-io-size: 100% + formats: [2] + io-engine: rbd + rw: randwrite + runtime: 600 diff --git a/qa/suites/rbd/pwl-cache/home/7-workloads/qemu_xfstests.yaml b/qa/suites/rbd/pwl-cache/home/7-workloads/qemu_xfstests.yaml new file mode 100644 index 0000000000000..255b9631e39f8 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/7-workloads/qemu_xfstests.yaml @@ -0,0 +1,8 @@ +tasks: +- qemu: + client.0: + test: qa/run_xfstests_qemu.sh + type: block + cpus: 4 + memory: 4096 + disks: 3 diff --git a/qa/suites/rbd/pwl-cache/home/7-workloads/recovery.yaml b/qa/suites/rbd/pwl-cache/home/7-workloads/recovery.yaml new file mode 100644 index 0000000000000..63a0c9dcf2558 --- /dev/null +++ b/qa/suites/rbd/pwl-cache/home/7-workloads/recovery.yaml @@ -0,0 +1,10 @@ +tasks: +- rbd.create_image: + client.0: + image_name: testimage + image_size: 10 + image_format: 2 +- exec: + client.0: + - "timeout 10s rbd bench --io-pattern rand --io-type write testimage || true" + - "rbd bench --io-type write --io-pattern rand --io-total 32M testimage"