From 8bd233bef5aa4b0571a455440213bbb2624b0d65 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Thu, 25 Jul 2024 17:10:50 +0000 Subject: [PATCH] qa/bluestore: Add write_v1/v2 selection Add framework for various random options for debug bluestore. Use framework to select: - write_v1 - write_v2 - write_v1 / write_v2 selected at random Signed-off-by: Adam Kupczyk --- qa/objectstore_debug/% | 0 .../bluestore-options/write$/write_random.yaml | 5 +++++ qa/objectstore_debug/bluestore-options/write$/write_v1.yaml | 5 +++++ qa/objectstore_debug/bluestore-options/write$/write_v2.yaml | 5 +++++ qa/objectstore_debug/{ => bluestore}/bluestore-bitmap.yaml | 0 qa/objectstore_debug/{ => bluestore}/bluestore-comp-lz4.yaml | 0 .../{ => bluestore}/bluestore-comp-snappy.yaml | 0 .../{ => bluestore}/bluestore-comp-zlib.yaml | 0 .../{ => bluestore}/bluestore-comp-zstd.yaml | 0 qa/objectstore_debug/{ => bluestore}/bluestore-hybrid.yaml | 0 .../{ => bluestore}/bluestore-low-osd-mem-target.yaml | 0 qa/objectstore_debug/{ => bluestore}/bluestore-stupid.yaml | 0 .../singleton-bluestore/objectstore/bluestore-bitmap.yaml | 2 +- .../singleton-bluestore/objectstore/bluestore-comp-lz4.yaml | 2 +- .../objectstore/bluestore-comp-snappy.yaml | 2 +- .../thrash-erasure-code-overwrites/bluestore-bitmap.yaml | 2 +- qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml | 2 +- 17 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 qa/objectstore_debug/% create mode 100644 qa/objectstore_debug/bluestore-options/write$/write_random.yaml create mode 100644 qa/objectstore_debug/bluestore-options/write$/write_v1.yaml create mode 100644 qa/objectstore_debug/bluestore-options/write$/write_v2.yaml rename qa/objectstore_debug/{ => bluestore}/bluestore-bitmap.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-comp-lz4.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-comp-snappy.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-comp-zlib.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-comp-zstd.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-hybrid.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-low-osd-mem-target.yaml (100%) rename qa/objectstore_debug/{ => bluestore}/bluestore-stupid.yaml (100%) diff --git a/qa/objectstore_debug/% b/qa/objectstore_debug/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/objectstore_debug/bluestore-options/write$/write_random.yaml b/qa/objectstore_debug/bluestore-options/write$/write_random.yaml new file mode 100644 index 0000000000000..d14f561c72a72 --- /dev/null +++ b/qa/objectstore_debug/bluestore-options/write$/write_random.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2 random: true diff --git a/qa/objectstore_debug/bluestore-options/write$/write_v1.yaml b/qa/objectstore_debug/bluestore-options/write$/write_v1.yaml new file mode 100644 index 0000000000000..4b20e8e52ca87 --- /dev/null +++ b/qa/objectstore_debug/bluestore-options/write$/write_v1.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2: false diff --git a/qa/objectstore_debug/bluestore-options/write$/write_v2.yaml b/qa/objectstore_debug/bluestore-options/write$/write_v2.yaml new file mode 100644 index 0000000000000..238973b1165cc --- /dev/null +++ b/qa/objectstore_debug/bluestore-options/write$/write_v2.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2: true diff --git a/qa/objectstore_debug/bluestore-bitmap.yaml b/qa/objectstore_debug/bluestore/bluestore-bitmap.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-bitmap.yaml rename to qa/objectstore_debug/bluestore/bluestore-bitmap.yaml diff --git a/qa/objectstore_debug/bluestore-comp-lz4.yaml b/qa/objectstore_debug/bluestore/bluestore-comp-lz4.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-comp-lz4.yaml rename to qa/objectstore_debug/bluestore/bluestore-comp-lz4.yaml diff --git a/qa/objectstore_debug/bluestore-comp-snappy.yaml b/qa/objectstore_debug/bluestore/bluestore-comp-snappy.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-comp-snappy.yaml rename to qa/objectstore_debug/bluestore/bluestore-comp-snappy.yaml diff --git a/qa/objectstore_debug/bluestore-comp-zlib.yaml b/qa/objectstore_debug/bluestore/bluestore-comp-zlib.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-comp-zlib.yaml rename to qa/objectstore_debug/bluestore/bluestore-comp-zlib.yaml diff --git a/qa/objectstore_debug/bluestore-comp-zstd.yaml b/qa/objectstore_debug/bluestore/bluestore-comp-zstd.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-comp-zstd.yaml rename to qa/objectstore_debug/bluestore/bluestore-comp-zstd.yaml diff --git a/qa/objectstore_debug/bluestore-hybrid.yaml b/qa/objectstore_debug/bluestore/bluestore-hybrid.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-hybrid.yaml rename to qa/objectstore_debug/bluestore/bluestore-hybrid.yaml diff --git a/qa/objectstore_debug/bluestore-low-osd-mem-target.yaml b/qa/objectstore_debug/bluestore/bluestore-low-osd-mem-target.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-low-osd-mem-target.yaml rename to qa/objectstore_debug/bluestore/bluestore-low-osd-mem-target.yaml diff --git a/qa/objectstore_debug/bluestore-stupid.yaml b/qa/objectstore_debug/bluestore/bluestore-stupid.yaml similarity index 100% rename from qa/objectstore_debug/bluestore-stupid.yaml rename to qa/objectstore_debug/bluestore/bluestore-stupid.yaml diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml index 66cf2bc759378..58e253bf6f452 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml @@ -1 +1 @@ -.qa/objectstore_debug/bluestore-bitmap.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml index da2e2598c338c..d694c94945fbe 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml @@ -1 +1 @@ -.qa/objectstore_debug/bluestore-comp-lz4.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore/bluestore-comp-lz4.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml index f75b0e1b48e2f..d7defabaa3c95 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml @@ -1 +1 @@ -.qa/objectstore_debug/bluestore-comp-snappy.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore/bluestore-comp-snappy.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml b/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml index 635085f7fc879..08070caa3878d 120000 --- a/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml +++ b/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml @@ -1 +1 @@ -../thrash-erasure-code/objectstore/bluestore-bitmap.yaml \ No newline at end of file +../thrash-erasure-code/objectstore/bluestore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml b/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml index 66cf2bc759378..58e253bf6f452 120000 --- a/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml +++ b/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml @@ -1 +1 @@ -.qa/objectstore_debug/bluestore-bitmap.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore/bluestore-bitmap.yaml \ No newline at end of file