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 <mbreizma@redhat.com>

diff --git a/qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml b/qa/objectstore/crimson/seastore/crimson_seastore_rbm.yaml
deleted file mode 100644 (file)
index 1674a1d..0000000
--- a/qa/objectstore/crimson/seastore/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/crimson_seastore_segmented.yaml b/qa/objectstore/crimson/seastore/crimson_seastore_segmented.yaml
deleted file mode 100644 (file)
index 148de20..0000000
--- a/qa/objectstore/crimson/seastore/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/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/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled b/qa/suites/crimson-rados/objectstore_tool/objectstore/seastore/seastore-rbm.yaml.disabled
index 4fe8d61d814bfdaad6b484bbb12caebadcd954dc..7a8ab764887d93c97cad9005adbd5c703540e64c 120000 (symlink)
--- 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 f90e011e957e43e4351710ffe5afec05f282a3e8..aa88fe4b448da009d1d4550edb54eef972d0fffa 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/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 (symlink)
index 0000000..5368447
--- /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 (symlink)
index a602a03..0000000
--- 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 (symlink)
index 4fe8d61..0000000
--- 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 (symlink)
index f90e011..0000000
--- 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