qa/suites/crimson-rados: make use of crimson_osd_objectstore

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/qa/config/crimson_bluestore.yaml b/qa/config/crimson_bluestore.yaml
new file mode 100644 (file)
index 0000000..d5ba487
--- /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 8cf98f3800167b8e07105e53e27b4f6fb92a98d2..a10c59d77cc010b84f1457c0af2b81f306ad20eb 100644 (file)
--- 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 (file)
index 0000000..d191945
--- /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 (file)
index 6158563..0000000
--- 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 (symlink)
index 0000000..61e26e7
--- /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 (symlink)
index 6a70c38..0000000
--- 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 e84f396e4b2b25689496700c1286b3bfec8bd2c5..481e393be4a3e2ce5126341e823484ee06fa529c 120000 (symlink)
--- 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 6a70c381709399d6fe47fc00e0ac0ce0bb5cc26b..61e26e7acf8248871c35aeeef5cfbdf1b5e04457 120000 (symlink)
--- 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 e84f396e4b2b25689496700c1286b3bfec8bd2c5..481e393be4a3e2ce5126341e823484ee06fa529c 120000 (symlink)
--- 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 6a70c381709399d6fe47fc00e0ac0ce0bb5cc26b..61e26e7acf8248871c35aeeef5cfbdf1b5e04457 120000 (symlink)
--- 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 e84f396e4b2b25689496700c1286b3bfec8bd2c5..481e393be4a3e2ce5126341e823484ee06fa529c 120000 (symlink)
--- 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 6a70c381709399d6fe47fc00e0ac0ce0bb5cc26b..61e26e7acf8248871c35aeeef5cfbdf1b5e04457 120000 (symlink)
--- 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 (symlink)
index dbccf5a..0000000
--- 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 (symlink)
index 0000000..a602a03
--- /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 (symlink)
index 0000000..481e393
--- /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 (symlink)
index 0000000..61e26e7
--- /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 e84f396e4b2b25689496700c1286b3bfec8bd2c5..481e393be4a3e2ce5126341e823484ee06fa529c 120000 (symlink)
--- 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 (symlink)
index 0000000..61e26e7
--- /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 e84f396e4b2b25689496700c1286b3bfec8bd2c5..481e393be4a3e2ce5126341e823484ee06fa529c 120000 (symlink)
--- 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 6a70c381709399d6fe47fc00e0ac0ce0bb5cc26b..61e26e7acf8248871c35aeeef5cfbdf1b5e04457 120000 (symlink)
--- 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