qa: exclude crimson from random-objectstore

In rados/dashboard tests, random-objectstore is symlinked to
qa/objectstore. After #64715,
qa/objectstore also contains seastore as an objectstore.

To prevent seastore being used as an objectstore for
rados/dashboard tests, a new dir is created under qa/
which contains only crimson and seastore  specific yamls.

All other symlinks to crimson/seastore objectstore have
also been updated.

Fixes: https://tracker.ceph.com/issues/74052
Signed-off-by: Shraddha Agrawal <shraddhaag@ibm.com>

diff --git a/qa/objectstore/crimson/crimson_bluestore.yaml b/qa/objectstore/crimson/crimson_bluestore.yaml
deleted file mode 100644 (file)
index ff9bcab..0000000
--- a/qa/objectstore/crimson/crimson_bluestore.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        # crimson's osd objectstore option
-        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/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml b/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml
deleted file mode 100644 (file)
index 1674a1d..0000000
--- a/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        # crimson's osd objectstore option
-        osd objectstore: seastore
-        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/rbm$/crimson_seastore_rbm_2q.yaml b/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml
deleted file mode 100644 (file)
index 27467c1..0000000
--- a/qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-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/segmented$/crimson_seastore_segmented.yaml b/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml
deleted file mode 100644 (file)
index 148de20..0000000
--- a/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        # crimson's osd objectstore option
-        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/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml b/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml
deleted file mode 100644 (file)
index 1ceadfb..0000000
--- a/qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-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/objectstore_crimson/crimson_bluestore.yaml b/qa/objectstore_crimson/crimson_bluestore.yaml
new file mode 100644 (file)
index 0000000..ff9bcab
--- /dev/null
+++ b/qa/objectstore_crimson/crimson_bluestore.yaml
@@ -0,0 +1,25 @@
+overrides:
+  ceph:
+    fs: xfs
+    conf:
+      osd:
+        # crimson's osd objectstore option
+        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/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml
new file mode 100644 (file)
index 0000000..1674a1d
--- /dev/null
+++ b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml
@@ -0,0 +1,21 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        # crimson's osd objectstore option
+        osd objectstore: seastore
+        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/rbm$/crimson_seastore_rbm_2q.yaml b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml
new file mode 100644 (file)
index 0000000..27467c1
--- /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/segmented$/crimson_seastore_segmented.yaml b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml
new file mode 100644 (file)
index 0000000..148de20
--- /dev/null
+++ b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml
@@ -0,0 +1,20 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        # crimson's osd objectstore option
+        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/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml
new file mode 100644 (file)
index 0000000..1ceadfb
--- /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/basic/objectstore b/qa/suites/crimson-rados/basic/objectstore
index 921836a8a5ef858dae7653c98eb80f152b6b4e48..1118d10d17cea0acf73942e2d810b0f3ae4ef6b8 120000 (symlink)
--- a/qa/suites/crimson-rados/basic/objectstore
+++ b/qa/suites/crimson-rados/basic/objectstore
@@ -1 +1 @@
-.qa/objectstore/crimson
\ No newline at end of file
+.qa/objectstore_crimson
\ 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 aa88fe4b448da009d1d4550edb54eef972d0fffa..46903a8c942a61dd1c3e3b6ed864ef7f2a176602 120000 (symlink)
--- 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/segmented$/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/perf/objectstore b/qa/suites/crimson-rados/perf/objectstore
index 921836a8a5ef858dae7653c98eb80f152b6b4e48..1118d10d17cea0acf73942e2d810b0f3ae4ef6b8 120000 (symlink)
--- a/qa/suites/crimson-rados/perf/objectstore
+++ b/qa/suites/crimson-rados/perf/objectstore
@@ -1 +1 @@
-.qa/objectstore/crimson
\ No newline at end of file
+.qa/objectstore_crimson
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/rbd/objectstore b/qa/suites/crimson-rados/rbd/objectstore
index 921836a8a5ef858dae7653c98eb80f152b6b4e48..1118d10d17cea0acf73942e2d810b0f3ae4ef6b8 120000 (symlink)
--- a/qa/suites/crimson-rados/rbd/objectstore
+++ b/qa/suites/crimson-rados/rbd/objectstore
@@ -1 +1 @@
-.qa/objectstore/crimson
\ No newline at end of file
+.qa/objectstore_crimson
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/singleton/objectstore b/qa/suites/crimson-rados/singleton/objectstore
index 921836a8a5ef858dae7653c98eb80f152b6b4e48..1118d10d17cea0acf73942e2d810b0f3ae4ef6b8 120000 (symlink)
--- a/qa/suites/crimson-rados/singleton/objectstore
+++ b/qa/suites/crimson-rados/singleton/objectstore
@@ -1 +1 @@
-.qa/objectstore/crimson
\ No newline at end of file
+.qa/objectstore_crimson
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash/objectstore b/qa/suites/crimson-rados/thrash/objectstore
index 02aa1bc117a4a3dfe908b4bbe85f21fad2cd0925..1118d10d17cea0acf73942e2d810b0f3ae4ef6b8 120000 (symlink)
--- a/qa/suites/crimson-rados/thrash/objectstore
+++ b/qa/suites/crimson-rados/thrash/objectstore
@@ -1 +1 @@
-.qa/objectstore/crimson/
\ No newline at end of file
+.qa/objectstore_crimson
\ No newline at end of file