From: Matan Breizman Date: Mon, 25 Nov 2024 12:03:46 +0000 (+0000) Subject: qa/suites/crimson-rados: make use of crimson_osd_objectstore X-Git-Tag: v20.0.0~484^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3a6ce3cadf42bb545ff774af582dbd2a6bff5c70;p=ceph.git qa/suites/crimson-rados: make use of crimson_osd_objectstore Signed-off-by: Matan Breizman --- diff --git a/qa/config/crimson_bluestore.yaml b/qa/config/crimson_bluestore.yaml new file mode 100644 index 0000000000000..d5ba487b9bfd2 --- /dev/null +++ b/qa/config/crimson_bluestore.yaml @@ -0,0 +1,25 @@ +overrides: + ceph: + fs: xfs + conf: + osd: + # crimson's osd objectstore option + crimson osd objectstore: bluestore + debug alienstore: 20 + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore compression mode: aggressive + bluestore fsck on mount: true + bluestore compression algorithm: snappy + # lower the full ratios since we can fill up a 100gb osd so quickly + mon osd full ratio: .9 + mon osd backfillfull_ratio: .85 + mon osd nearfull ratio: .8 + osd failsafe full ratio: .95 + bluestore rocksdb cf: false + log to stderr: true + err to stderr: true + log flush on exit: true + log to file: false diff --git a/qa/config/crimson_qa_overrides.yaml b/qa/config/crimson_qa_overrides.yaml index 8cf98f3800167..a10c59d77cc01 100644 --- a/qa/config/crimson_qa_overrides.yaml +++ b/qa/config/crimson_qa_overrides.yaml @@ -9,7 +9,6 @@ overrides: osd pool default crimson: true osd: crimson osd obc lru size: 10 - debug alienstore: 20 debug ms: 20 flavor: crimson workunit: diff --git a/qa/config/crimson_seastore.yaml b/qa/config/crimson_seastore.yaml new file mode 100644 index 0000000000000..d1919456ab1c7 --- /dev/null +++ b/qa/config/crimson_seastore.yaml @@ -0,0 +1,20 @@ +overrides: + ceph: + conf: + osd: + # crimson's osd objectstore option + crimson osd objectstore: seastore + 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/config/seastore.yaml b/qa/config/seastore.yaml deleted file mode 100644 index 6158563eedfdb..0000000000000 --- a/qa/config/seastore.yaml +++ /dev/null @@ -1,20 +0,0 @@ -overrides: - ceph: - fs: xfs - conf: - osd: - osd objectstore: seastore - debug seastore: 20 - debug seastore onode: 20 - debug seastore odata: 20 - debug seastore ompap: 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-experimental/seastore/basic/objectstore/crimson_seastore.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/crimson_seastore.yaml new file mode 120000 index 0000000000000..61e26e7acf824 --- /dev/null +++ b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/crimson_seastore.yaml @@ -0,0 +1 @@ +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml deleted file mode 120000 index 6a70c38170939..0000000000000 --- a/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/config/seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/basic/objectstore/bluestore.yaml b/qa/suites/crimson-rados/basic/objectstore/bluestore.yaml index e84f396e4b2b2..481e393be4a3e 120000 --- a/qa/suites/crimson-rados/basic/objectstore/bluestore.yaml +++ b/qa/suites/crimson-rados/basic/objectstore/bluestore.yaml @@ -1 +1 @@ -.qa/config/bluestore.yaml \ No newline at end of file +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/basic/objectstore/seastore.yaml b/qa/suites/crimson-rados/basic/objectstore/seastore.yaml index 6a70c38170939..61e26e7acf824 120000 --- a/qa/suites/crimson-rados/basic/objectstore/seastore.yaml +++ b/qa/suites/crimson-rados/basic/objectstore/seastore.yaml @@ -1 +1 @@ -.qa/config/seastore.yaml \ No newline at end of file +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/perf/objectstore/bluestore.yaml b/qa/suites/crimson-rados/perf/objectstore/bluestore.yaml index e84f396e4b2b2..481e393be4a3e 120000 --- a/qa/suites/crimson-rados/perf/objectstore/bluestore.yaml +++ b/qa/suites/crimson-rados/perf/objectstore/bluestore.yaml @@ -1 +1 @@ -.qa/config/bluestore.yaml \ No newline at end of file +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/perf/objectstore/seastore.yaml b/qa/suites/crimson-rados/perf/objectstore/seastore.yaml index 6a70c38170939..61e26e7acf824 120000 --- a/qa/suites/crimson-rados/perf/objectstore/seastore.yaml +++ b/qa/suites/crimson-rados/perf/objectstore/seastore.yaml @@ -1 +1 @@ -.qa/config/seastore.yaml \ No newline at end of file +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/rbd/objectstore/bluestore.yaml b/qa/suites/crimson-rados/rbd/objectstore/bluestore.yaml index e84f396e4b2b2..481e393be4a3e 120000 --- a/qa/suites/crimson-rados/rbd/objectstore/bluestore.yaml +++ b/qa/suites/crimson-rados/rbd/objectstore/bluestore.yaml @@ -1 +1 @@ -.qa/config/bluestore.yaml \ No newline at end of file +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/rbd/objectstore/seastore.yaml b/qa/suites/crimson-rados/rbd/objectstore/seastore.yaml index 6a70c38170939..61e26e7acf824 120000 --- a/qa/suites/crimson-rados/rbd/objectstore/seastore.yaml +++ b/qa/suites/crimson-rados/rbd/objectstore/seastore.yaml @@ -1 +1 @@ -.qa/config/seastore.yaml \ No newline at end of file +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/singleton/objectstore b/qa/suites/crimson-rados/singleton/objectstore deleted file mode 120000 index dbccf5ad92894..0000000000000 --- a/qa/suites/crimson-rados/singleton/objectstore +++ /dev/null @@ -1 +0,0 @@ -../thrash/objectstore \ No newline at end of file diff --git a/qa/suites/crimson-rados/singleton/objectstore/.qa b/qa/suites/crimson-rados/singleton/objectstore/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/crimson-rados/singleton/objectstore/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/crimson-rados/singleton/objectstore/bluestore.yaml b/qa/suites/crimson-rados/singleton/objectstore/bluestore.yaml new file mode 120000 index 0000000000000..481e393be4a3e --- /dev/null +++ b/qa/suites/crimson-rados/singleton/objectstore/bluestore.yaml @@ -0,0 +1 @@ +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/singleton/objectstore/seastore.yaml b/qa/suites/crimson-rados/singleton/objectstore/seastore.yaml new file mode 120000 index 0000000000000..61e26e7acf824 --- /dev/null +++ b/qa/suites/crimson-rados/singleton/objectstore/seastore.yaml @@ -0,0 +1 @@ +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash/objectstore/bluestore.yaml b/qa/suites/crimson-rados/thrash/objectstore/bluestore.yaml index e84f396e4b2b2..481e393be4a3e 120000 --- a/qa/suites/crimson-rados/thrash/objectstore/bluestore.yaml +++ b/qa/suites/crimson-rados/thrash/objectstore/bluestore.yaml @@ -1 +1 @@ -.qa/config/bluestore.yaml \ No newline at end of file +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash/objectstore/seastore.yaml b/qa/suites/crimson-rados/thrash/objectstore/seastore.yaml new file mode 120000 index 0000000000000..61e26e7acf824 --- /dev/null +++ b/qa/suites/crimson-rados/thrash/objectstore/seastore.yaml @@ -0,0 +1 @@ +.qa/config/crimson_seastore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_simple/objectstore/bluestore.yaml b/qa/suites/crimson-rados/thrash_simple/objectstore/bluestore.yaml index e84f396e4b2b2..481e393be4a3e 120000 --- a/qa/suites/crimson-rados/thrash_simple/objectstore/bluestore.yaml +++ b/qa/suites/crimson-rados/thrash_simple/objectstore/bluestore.yaml @@ -1 +1 @@ -.qa/config/bluestore.yaml \ No newline at end of file +.qa/config/crimson_bluestore.yaml \ No newline at end of file diff --git a/qa/suites/crimson-rados/thrash_simple/objectstore/seastore.yaml b/qa/suites/crimson-rados/thrash_simple/objectstore/seastore.yaml index 6a70c38170939..61e26e7acf824 120000 --- a/qa/suites/crimson-rados/thrash_simple/objectstore/seastore.yaml +++ b/qa/suites/crimson-rados/thrash_simple/objectstore/seastore.yaml @@ -1 +1 @@ -.qa/config/seastore.yaml \ No newline at end of file +.qa/config/crimson_seastore.yaml \ No newline at end of file