From 87478973f491d6b7012764aec089c36047d74a14 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 23 Jan 2015 21:50:01 -0800 Subject: [PATCH] suites/rbd: split qemu and librbd tests qemu tests take a long time. We'll want to test more combinations of options with librbd directly. Signed-off-by: Josh Durgin --- suites/rbd/qemu/% | 0 suites/rbd/qemu/cache/none.yaml | 6 ++++++ suites/rbd/qemu/cache/writeback.yaml | 6 ++++++ suites/rbd/qemu/cache/writethrough.yaml | 7 +++++++ suites/rbd/qemu/cachepool/none.yaml | 0 suites/rbd/qemu/cachepool/small.yaml | 11 +++++++++++ suites/rbd/qemu/clusters/fixed-3.yaml | 1 + suites/rbd/qemu/fs | 1 + suites/rbd/qemu/msgr-failures/few.yaml | 7 +++++++ .../rbd/{librbd => qemu}/workloads/qemu_bonnie.yaml | 0 .../rbd/{librbd => qemu}/workloads/qemu_fsstress.yaml | 0 .../workloads/qemu_iozone.yaml.disabled | 0 .../rbd/{librbd => qemu}/workloads/qemu_xfstests.yaml | 0 13 files changed, 39 insertions(+) create mode 100644 suites/rbd/qemu/% create mode 100644 suites/rbd/qemu/cache/none.yaml create mode 100644 suites/rbd/qemu/cache/writeback.yaml create mode 100644 suites/rbd/qemu/cache/writethrough.yaml create mode 100644 suites/rbd/qemu/cachepool/none.yaml create mode 100644 suites/rbd/qemu/cachepool/small.yaml create mode 120000 suites/rbd/qemu/clusters/fixed-3.yaml create mode 120000 suites/rbd/qemu/fs create mode 100644 suites/rbd/qemu/msgr-failures/few.yaml rename suites/rbd/{librbd => qemu}/workloads/qemu_bonnie.yaml (100%) rename suites/rbd/{librbd => qemu}/workloads/qemu_fsstress.yaml (100%) rename suites/rbd/{librbd => qemu}/workloads/qemu_iozone.yaml.disabled (100%) rename suites/rbd/{librbd => qemu}/workloads/qemu_xfstests.yaml (100%) diff --git a/suites/rbd/qemu/% b/suites/rbd/qemu/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/rbd/qemu/cache/none.yaml b/suites/rbd/qemu/cache/none.yaml new file mode 100644 index 0000000000000..42fd9c95562ac --- /dev/null +++ b/suites/rbd/qemu/cache/none.yaml @@ -0,0 +1,6 @@ +tasks: +- install: +- ceph: + conf: + client: + rbd cache: false diff --git a/suites/rbd/qemu/cache/writeback.yaml b/suites/rbd/qemu/cache/writeback.yaml new file mode 100644 index 0000000000000..86fe06afa0501 --- /dev/null +++ b/suites/rbd/qemu/cache/writeback.yaml @@ -0,0 +1,6 @@ +tasks: +- install: +- ceph: + conf: + client: + rbd cache: true diff --git a/suites/rbd/qemu/cache/writethrough.yaml b/suites/rbd/qemu/cache/writethrough.yaml new file mode 100644 index 0000000000000..6dc29e16c02c7 --- /dev/null +++ b/suites/rbd/qemu/cache/writethrough.yaml @@ -0,0 +1,7 @@ +tasks: +- install: +- ceph: + conf: + client: + rbd cache: true + rbd cache max dirty: 0 diff --git a/suites/rbd/qemu/cachepool/none.yaml b/suites/rbd/qemu/cachepool/none.yaml new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/rbd/qemu/cachepool/small.yaml b/suites/rbd/qemu/cachepool/small.yaml new file mode 100644 index 0000000000000..f8ed11040fa42 --- /dev/null +++ b/suites/rbd/qemu/cachepool/small.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - ceph osd pool create cache 4 + - ceph osd tier add rbd cache + - ceph osd tier cache-mode cache writeback + - ceph osd tier set-overlay rbd cache + - ceph osd pool set cache hit_set_type bloom + - ceph osd pool set cache hit_set_count 8 + - ceph osd pool set cache hit_set_period 60 + - ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/qemu/clusters/fixed-3.yaml b/suites/rbd/qemu/clusters/fixed-3.yaml new file mode 120000 index 0000000000000..a3ac9fc4dec2f --- /dev/null +++ b/suites/rbd/qemu/clusters/fixed-3.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/rbd/qemu/fs b/suites/rbd/qemu/fs new file mode 120000 index 0000000000000..3658920363d1a --- /dev/null +++ b/suites/rbd/qemu/fs @@ -0,0 +1 @@ +../basic/fs \ No newline at end of file diff --git a/suites/rbd/qemu/msgr-failures/few.yaml b/suites/rbd/qemu/msgr-failures/few.yaml new file mode 100644 index 0000000000000..a8bc68355ea48 --- /dev/null +++ b/suites/rbd/qemu/msgr-failures/few.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + global: + ms inject socket failures: 5000 + log-whitelist: + - wrongly marked me down diff --git a/suites/rbd/librbd/workloads/qemu_bonnie.yaml b/suites/rbd/qemu/workloads/qemu_bonnie.yaml similarity index 100% rename from suites/rbd/librbd/workloads/qemu_bonnie.yaml rename to suites/rbd/qemu/workloads/qemu_bonnie.yaml diff --git a/suites/rbd/librbd/workloads/qemu_fsstress.yaml b/suites/rbd/qemu/workloads/qemu_fsstress.yaml similarity index 100% rename from suites/rbd/librbd/workloads/qemu_fsstress.yaml rename to suites/rbd/qemu/workloads/qemu_fsstress.yaml diff --git a/suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled b/suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled similarity index 100% rename from suites/rbd/librbd/workloads/qemu_iozone.yaml.disabled rename to suites/rbd/qemu/workloads/qemu_iozone.yaml.disabled diff --git a/suites/rbd/librbd/workloads/qemu_xfstests.yaml b/suites/rbd/qemu/workloads/qemu_xfstests.yaml similarity index 100% rename from suites/rbd/librbd/workloads/qemu_xfstests.yaml rename to suites/rbd/qemu/workloads/qemu_xfstests.yaml -- 2.39.5