From c3c9e5ebad2a14a9a4d872be86df8a775b3cbf25 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Thu, 22 May 2025 10:55:02 +0000 Subject: [PATCH] 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 --- qa/objectstore_debug/bluestore/write$/random/+ | 0 .../bluestore/{ => write$/random}/compr$/no$/no.yaml | 0 .../bluestore/write$/random/compr$/yes$/lz4.yaml | 7 +++++++ .../bluestore/write$/random/compr$/yes$/snappy.yaml | 7 +++++++ .../bluestore/write$/random/compr$/yes$/zlib.yaml | 7 +++++++ .../bluestore/write$/random/compr$/yes$/zstd.yaml | 7 +++++++ .../write$/{write_random.yaml => random/random.yaml} | 0 qa/objectstore_debug/bluestore/write$/v1/+ | 0 .../bluestore/write$/v1/compr$/no$/no.yaml | 4 ++++ .../bluestore/{ => write$/v1}/compr$/yes$/lz4.yaml | 0 .../bluestore/{ => write$/v1}/compr$/yes$/snappy.yaml | 0 .../bluestore/{ => write$/v1}/compr$/yes$/zlib.yaml | 0 .../bluestore/{ => write$/v1}/compr$/yes$/zstd.yaml | 0 .../bluestore/write$/{write_v1.yaml => v1/v1.yaml} | 0 qa/objectstore_debug/bluestore/write$/v2/+ | 0 .../bluestore/write$/v2/compr$/no$/no.yaml | 4 ++++ .../bluestore/write$/v2/compr$/yes$/lz4.yaml | 7 +++++++ .../bluestore/write$/v2/compr$/yes$/snappy.yaml | 7 +++++++ .../bluestore/write$/v2/compr$/yes$/zlib.yaml | 7 +++++++ .../bluestore/write$/v2/compr$/yes$/zstd.yaml | 7 +++++++ .../bluestore/write$/{write_v2.yaml => v2/v2.yaml} | 0 21 files changed, 64 insertions(+) create mode 100644 qa/objectstore_debug/bluestore/write$/random/+ rename qa/objectstore_debug/bluestore/{ => write$/random}/compr$/no$/no.yaml (100%) create mode 100644 qa/objectstore_debug/bluestore/write$/random/compr$/yes$/lz4.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/random/compr$/yes$/snappy.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zlib.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/random/compr$/yes$/zstd.yaml rename qa/objectstore_debug/bluestore/write$/{write_random.yaml => random/random.yaml} (100%) create mode 100644 qa/objectstore_debug/bluestore/write$/v1/+ create mode 100644 qa/objectstore_debug/bluestore/write$/v1/compr$/no$/no.yaml rename qa/objectstore_debug/bluestore/{ => write$/v1}/compr$/yes$/lz4.yaml (100%) rename qa/objectstore_debug/bluestore/{ => write$/v1}/compr$/yes$/snappy.yaml (100%) rename qa/objectstore_debug/bluestore/{ => write$/v1}/compr$/yes$/zlib.yaml (100%) rename qa/objectstore_debug/bluestore/{ => write$/v1}/compr$/yes$/zstd.yaml (100%) rename qa/objectstore_debug/bluestore/write$/{write_v1.yaml => v1/v1.yaml} (100%) create mode 100644 qa/objectstore_debug/bluestore/write$/v2/+ create mode 100644 qa/objectstore_debug/bluestore/write$/v2/compr$/no$/no.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/lz4.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/snappy.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zlib.yaml create mode 100644 qa/objectstore_debug/bluestore/write$/v2/compr$/yes$/zstd.yaml rename qa/objectstore_debug/bluestore/write$/{write_v2.yaml => v2/v2.yaml} (100%) 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/compr$/no$/no.yaml b/qa/objectstore_debug/bluestore/write$/random/compr$/no$/no.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/compr$/no$/no.yaml rename to qa/objectstore_debug/bluestore/write$/random/compr$/no$/no.yaml 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$/write_random.yaml b/qa/objectstore_debug/bluestore/write$/random/random.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/write$/write_random.yaml rename to qa/objectstore_debug/bluestore/write$/random/random.yaml 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/compr$/yes$/lz4.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/lz4.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/compr$/yes$/lz4.yaml rename to qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/lz4.yaml diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/snappy.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/snappy.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/compr$/yes$/snappy.yaml rename to qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/snappy.yaml diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/zlib.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zlib.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/compr$/yes$/zlib.yaml rename to qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zlib.yaml diff --git a/qa/objectstore_debug/bluestore/compr$/yes$/zstd.yaml b/qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zstd.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/compr$/yes$/zstd.yaml rename to qa/objectstore_debug/bluestore/write$/v1/compr$/yes$/zstd.yaml diff --git a/qa/objectstore_debug/bluestore/write$/write_v1.yaml b/qa/objectstore_debug/bluestore/write$/v1/v1.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/write$/write_v1.yaml rename to qa/objectstore_debug/bluestore/write$/v1/v1.yaml 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$/write_v2.yaml b/qa/objectstore_debug/bluestore/write$/v2/v2.yaml similarity index 100% rename from qa/objectstore_debug/bluestore/write$/write_v2.yaml rename to qa/objectstore_debug/bluestore/write$/v2/v2.yaml -- 2.39.5