From 8e794cf16f71c6be318f3514d6769f6cb54041b4 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 30 Jul 2025 08:36:49 +0000 Subject: [PATCH] qa/objectstore/crimson/seastore: add 2q cache type The directories which symlink to the common crimson objectstore will now also use 2q/lru randomly. Fixes: https://tracker.ceph.com/issues/72302 Signed-off-by: Matan Breizman --- .../{ => rbm$}/crimson_seastore_rbm.yaml | 0 .../rbm$/crimson_seastore_rbm_2q.yaml | 22 +++++++++++++++++++ .../crimson_seastore_segmented.yaml | 0 .../crimson_seastore_segmented_2q.yaml | 21 ++++++++++++++++++ .../seastore/seastore-rbm.yaml.disabled | 2 +- .../seastore/seastore-segmented.yaml | 2 +- .../objectstore/seastore | 1 + .../objectstore/seastore/.qa | 1 - .../objectstore/seastore/seastore-rbm.yaml | 1 - .../seastore/seastore-segmented.yaml | 1 - 10 files changed, 46 insertions(+), 5 deletions(-) rename qa/objectstore/crimson/seastore/{ => rbm$}/crimson_seastore_rbm.yaml (100%) create mode 100644 qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml rename qa/objectstore/crimson/seastore/{ => segmented$}/crimson_seastore_segmented.yaml (100%) create mode 100644 qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml create mode 120000 qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore delete mode 120000 qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/.qa delete mode 120000 qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-rbm.yaml delete mode 120000 qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-segmented.yaml diff --git a/qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml b/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml similarity index 100% rename from qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml rename to qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml diff --git a/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml b/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml new file mode 100644 index 0000000000000..27467c10c6aa1 --- /dev/null +++ b/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml @@ -0,0 +1,22 @@ +overrides: + ceph: + conf: + osd: + # crimson's osd objectstore option + osd objectstore: seastore + seastore cachepin type: 2Q + seastore main device type: RANDOM_BLOCK_SSD + debug seastore: 20 + debug seastore onode: 20 + debug seastore odata: 20 + debug seastore omap: 20 + debug seastore tm: 20 + debug seastore t: 20 + debug seastore cleaner: 20 + debug seastore epm: 20 + debug seastore lba: 20 + debug seastore fixedkv tree: 20 + debug seastore cache: 20 + debug seastore journal: 20 + debug seastore device: 20 + debug seastore backref: 20 diff --git a/qa/objectstore/crimson/seastore/crimson_seastore_segmented.yaml b/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml similarity index 100% rename from qa/objectstore/crimson/seastore/crimson_seastore_segmented.yaml rename to qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml diff --git a/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml b/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml new file mode 100644 index 0000000000000..1ceadfb0c24ed --- /dev/null +++ b/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml @@ -0,0 +1,21 @@ +overrides: + ceph: + conf: + osd: + # crimson's osd objectstore option + osd objectstore: seastore + seastore cachepin type: 2Q + debug seastore: 20 + debug seastore onode: 20 + debug seastore odata: 20 + debug seastore omap: 20 + debug seastore tm: 20 + debug seastore t: 20 + debug seastore cleaner: 20 + debug seastore epm: 20 + debug seastore lba: 20 + debug seastore fixedkv tree: 20 + debug seastore cache: 20 + debug seastore journal: 20 + debug seastore device: 20 + debug seastore backref: 20 diff --git a/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled b/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled index 4fe8d61d814bf..7a8ab764887d9 120000 --- a/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled +++ b/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled @@ -1 +1 @@ -.qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml \ No newline at end of file +.qa/objectstore/crimson/seastore/rbm$ \ No newline at end of file diff --git a/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-segmented.yaml b/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-segmented.yaml index f90e011e957e4..aa88fe4b448da 120000 --- a/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-segmented.yaml +++ b/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-segmented.yaml @@ -1 +1 @@ -.qa/objectstore/crimson/seastore/crimson_seastore_segmented.yaml \ No newline at end of file +.qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore b/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore new file mode 120000 index 0000000000000..5368447ec5a56 --- /dev/null +++ b/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore @@ -0,0 +1 @@ +.qa/objectstore/crimson/seastore/ \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/.qa b/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-rbm.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-rbm.yaml deleted file mode 120000 index 4fe8d61d814bf..0000000000000 --- a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-rbm.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-segmented.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-segmented.yaml deleted file mode 120000 index f90e011e957e4..0000000000000 --- a/qa/suites/crimson-rados/thrash_seastore_radosbench/objectstore/seastore/seastore-segmented.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/objectstore/crimson/seastore/crimson_seastore_segmented.yaml \ No newline at end of file -- 2.39.5