From: Adam Kupczyk Date: Thu, 22 May 2025 10:55:02 +0000 (+0000) Subject: qa/rados: Fix problem with recompression failing osd bench tesing X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c3c9e5ebad2a14a9a4d872be86df8a775b3cbf25;p=ceph.git qa/rados: Fix problem with recompression failing osd bench tesing The change refactors structure of objectstore_debug/bluestore. 1) compr$ dir is not longer independant dimension. 2) compr$ dir is multiplied into write$/(v1+v2+random) 3) write$/v1 gets original compr settings 4) write$/(v2+random) get modified compr with osd_mclock_skip_benchmark=true The rationale is to disable bench when both v2 and compression are enabled. Fixes: https://tracker.ceph.com/issues/71168 Note: Not really fixes, it just disables detecting symptoms. Real solution needs more sophisticated approach. Signed-off-by: Adam Kupczyk --- diff --git a/qa/objectstore_debug/bluestore/compr$/no$/no.yaml b/qa/objectstore_debug/bluestore/compr$/no$/no.yaml deleted file mode 100644 index 350255df13e04..0000000000000 --- a/qa/objectstore_debug/bluestore/compr$/no$/no.yaml +++ /dev/null @@ -1,4 +0,0 @@ -overrides: - ceph: - conf: - osd: diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/lz4.yaml b/qa/objectstore_debug/bluestore/compr$/yes$/lz4.yaml deleted file mode 100644 index a565dc4acb199..0000000000000 --- a/qa/objectstore_debug/bluestore/compr$/yes$/lz4.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore compression mode: aggressive - bluestore compression algorithm: lz4 diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/snappy.yaml b/qa/objectstore_debug/bluestore/compr$/yes$/snappy.yaml deleted file mode 100644 index 7e4493bbebc56..0000000000000 --- a/qa/objectstore_debug/bluestore/compr$/yes$/snappy.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore compression mode: aggressive - bluestore compression algorithm: snappy diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/zlib.yaml b/qa/objectstore_debug/bluestore/compr$/yes$/zlib.yaml deleted file mode 100644 index 83ec6c8b4a78d..0000000000000 --- a/qa/objectstore_debug/bluestore/compr$/yes$/zlib.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore compression mode: aggressive - bluestore compression algorithm: zlib diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/zstd.yaml b/qa/objectstore_debug/bluestore/compr$/yes$/zstd.yaml deleted file mode 100644 index 5149d8aaaf7e8..0000000000000 --- a/qa/objectstore_debug/bluestore/compr$/yes$/zstd.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore compression mode: aggressive - bluestore compression algorithm: zstd diff --git a/qa/objectstore_debug/bluestore/write$/random/+ b/qa/objectstore_debug/bluestore/write$/random/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/objectstore_debug/bluestore/write$/random/compr$/no$/no.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/no$/no.yaml new file mode 100644 index 0000000000000..350255df13e04 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/compr$/no$/no.yaml @@ -0,0 +1,4 @@ +overrides: + ceph: + conf: + osd: diff --git a/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/lz4.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/lz4.yaml new file mode 100644 index 0000000000000..4635ce6f88062 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/lz4.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: lz4 + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/snappy.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/snappy.yaml new file mode 100644 index 0000000000000..e2f4b3eca178a --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/snappy.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: snappy + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zlib.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zlib.yaml new file mode 100644 index 0000000000000..686e02abddf24 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zlib.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zlib + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zstd.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zstd.yaml new file mode 100644 index 0000000000000..fc37fc18caa4f --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zstd.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zstd + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/random/random.yaml b/qa/objectstore_debug/bluestore/write$/random/random.yaml new file mode 100644 index 0000000000000..d14f561c72a72 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/random/random.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2 random: true diff --git a/qa/objectstore_debug/bluestore/write$/v1/+ b/qa/objectstore_debug/bluestore/write$/v1/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/objectstore_debug/bluestore/write$/v1/compr$/no$/no.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/no$/no.yaml new file mode 100644 index 0000000000000..350255df13e04 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/compr$/no$/no.yaml @@ -0,0 +1,4 @@ +overrides: + ceph: + conf: + osd: diff --git a/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/lz4.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/lz4.yaml new file mode 100644 index 0000000000000..a565dc4acb199 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/lz4.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: lz4 diff --git a/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/snappy.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/snappy.yaml new file mode 100644 index 0000000000000..7e4493bbebc56 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/snappy.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: snappy diff --git a/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zlib.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zlib.yaml new file mode 100644 index 0000000000000..83ec6c8b4a78d --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zlib.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zlib diff --git a/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zstd.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zstd.yaml new file mode 100644 index 0000000000000..5149d8aaaf7e8 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zstd.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zstd diff --git a/qa/objectstore_debug/bluestore/write$/v1/v1.yaml b/qa/objectstore_debug/bluestore/write$/v1/v1.yaml new file mode 100644 index 0000000000000..4b20e8e52ca87 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v1/v1.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2: false diff --git a/qa/objectstore_debug/bluestore/write$/v2/+ b/qa/objectstore_debug/bluestore/write$/v2/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/objectstore_debug/bluestore/write$/v2/compr$/no$/no.yaml b/qa/objectstore_debug/bluestore/write$/v2/compr$/no$/no.yaml new file mode 100644 index 0000000000000..350255df13e04 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/compr$/no$/no.yaml @@ -0,0 +1,4 @@ +overrides: + ceph: + conf: + osd: diff --git a/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/lz4.yaml b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/lz4.yaml new file mode 100644 index 0000000000000..4635ce6f88062 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/lz4.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: lz4 + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/snappy.yaml b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/snappy.yaml new file mode 100644 index 0000000000000..e2f4b3eca178a --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/snappy.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: snappy + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zlib.yaml b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zlib.yaml new file mode 100644 index 0000000000000..686e02abddf24 --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zlib.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zlib + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zstd.yaml b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zstd.yaml new file mode 100644 index 0000000000000..fc37fc18caa4f --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zstd.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + osd: + bluestore compression mode: aggressive + bluestore compression algorithm: zstd + osd_mclock_skip_benchmark: true #new recompression makes us fail the test diff --git a/qa/objectstore_debug/bluestore/write$/v2/v2.yaml b/qa/objectstore_debug/bluestore/write$/v2/v2.yaml new file mode 100644 index 0000000000000..238973b1165cc --- /dev/null +++ b/qa/objectstore_debug/bluestore/write$/v2/v2.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + osd: + bluestore write v2: true diff --git a/qa/objectstore_debug/bluestore/write$/write_random.yaml b/qa/objectstore_debug/bluestore/write$/write_random.yaml deleted file mode 100644 index d14f561c72a72..0000000000000 --- a/qa/objectstore_debug/bluestore/write$/write_random.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore write v2 random: true diff --git a/qa/objectstore_debug/bluestore/write$/write_v1.yaml b/qa/objectstore_debug/bluestore/write$/write_v1.yaml deleted file mode 100644 index 4b20e8e52ca87..0000000000000 --- a/qa/objectstore_debug/bluestore/write$/write_v1.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore write v2: false diff --git a/qa/objectstore_debug/bluestore/write$/write_v2.yaml b/qa/objectstore_debug/bluestore/write$/write_v2.yaml deleted file mode 100644 index 238973b1165cc..0000000000000 --- a/qa/objectstore_debug/bluestore/write$/write_v2.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - osd: - bluestore write v2: true