qa/config/crimson_qa_overrides.yaml: add test workload for LBC

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

diff --git a/qa/config/crimson_logical_bucket_cache.yaml b/qa/config/crimson_logical_bucket_cache.yaml
new file mode 100644 (file)
index 0000000..c0223f8
--- /dev/null
+++ b/qa/config/crimson_logical_bucket_cache.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        seastore logical bucket cache test stress: true

diff --git a/qa/config/crimson_qa_overrides.yaml b/qa/config/crimson_qa_overrides.yaml
index ce095c423aff717c0992eec5a754f8352e07ebb8..3551d7e08700b8ba43cca4d4229341ca55265a40 100644 (file)
--- a/qa/config/crimson_qa_overrides.yaml
+++ b/qa/config/crimson_qa_overrides.yaml
@@ -14,6 +14,8 @@ overrides:
         debug ms: 20
         seastore cachepin size pershard: 64M
         seastore max concurrent transactions: 8
+      client:
+        debug_objecter: 20
     crimson_compat: true
   workunit:
     env:

diff --git a/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml
index 1674a1d8a02eda79ffbffc9647d578d53f3ce74a..0e8111a15efc0fbc858b4861e77f39168371b778 100644 (file)
--- a/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml
+++ b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm.yaml
@@ -4,7 +4,10 @@ overrides:
       osd:
         # crimson's osd objectstore option
         osd objectstore: seastore
-        seastore main device type: RANDOM_BLOCK_SSD
+        seastore hot device type: RANDOM_BLOCK_SSD
+        seastore hot backend type: RANDOM_BLOCK
+        seastore cold device type: RANDOM_BLOCK_HDD
+        seastore cold backend type: RANDOM_BLOCK
         debug seastore: 20
         debug seastore onode: 20
         debug seastore odata: 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
index 27467c10c6aa14758ca742c3380b226360e790d7..a74bc32a243e2fd2c1c9b4415a5df84882e135be 100644 (file)
--- a/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml
+++ b/qa/objectstore_crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml
@@ -5,7 +5,10 @@ overrides:
         # crimson's osd objectstore option
         osd objectstore: seastore
         seastore cachepin type: 2Q
-        seastore main device type: RANDOM_BLOCK_SSD
+        seastore hot device type: RANDOM_BLOCK_SSD
+        seastore hot backend type: RANDOM_BLOCK
+        seastore cold device type: RANDOM_BLOCK_HDD
+        seastore cold backend type: RANDOM_BLOCK
         debug seastore: 20
         debug seastore onode: 20
         debug seastore odata: 20

diff --git a/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml
index 148de206da371f191e31656365a5ca7ecbc03594..8bd32f3308541119fc3b2332c01938964c954e3d 100644 (file)
--- a/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml
+++ b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented.yaml
@@ -4,6 +4,8 @@ overrides:
       osd:
         # crimson's osd objectstore option
         osd objectstore: seastore
+        seastore cold device type: RANDOM_BLOCK_HDD
+        seastore cold backend type: RANDOM_BLOCK
         debug seastore: 20
         debug seastore onode: 20
         debug seastore odata: 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
index 1ceadfb0c24ed5126a0ed43a59119d60289607e0..8069fce3d773db64bb7878b6d9fde18e12081808 100644 (file)
--- a/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml
+++ b/qa/objectstore_crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml
@@ -5,6 +5,8 @@ overrides:
         # crimson's osd objectstore option
         osd objectstore: seastore
         seastore cachepin type: 2Q
+        seastore cold device type: RANDOM_BLOCK_HDD
+        seastore cold backend type: RANDOM_BLOCK
         debug seastore: 20
         debug seastore onode: 20
         debug seastore odata: 20

diff --git a/qa/suites/crimson-rados/basic/deploy/ceph.yaml b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
index 1af2f4b1bd2acb0eedd6387874fe9e869b91e2c9..4d836918199cb9e5799a180fa14ea898ec2701d6 100644 (file)
--- a/qa/suites/crimson-rados/basic/deploy/ceph.yaml
+++ b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
@@ -11,3 +11,8 @@ tasks:
         mon osdmap full prune min: 15
         mon osdmap full prune interval: 2
         mon osdmap full prune txsize: 2
+overrides:
+  ceph:
+    conf:
+      osd:
+        seastore logical bucket cache test stress: true

diff --git a/qa/suites/crimson-rados/cephfs/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/cephfs/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/cephfs/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/objectstore_tool/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/objectstore_tool/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/objectstore_tool/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/osd_shards/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/osd_shards/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/osd_shards/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/rbd/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/rbd/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/rbd/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/rgw/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/rgw/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/rgw/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/suites/crimson-rados/thrash/crimson_logical_bucket_cache.yaml b/qa/suites/crimson-rados/thrash/crimson_logical_bucket_cache.yaml
new file mode 120000 (symlink)
index 0000000..d963ced
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/crimson_logical_bucket_cache.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_logical_bucket_cache.yaml
\ No newline at end of file

diff --git a/qa/tasks/ceph_objectstore_tool.py b/qa/tasks/ceph_objectstore_tool.py
index ba978dbb29929b9657c1d6b8efee49b712dd63fb..444694bd9062715be8af7d6bd8c83d31ad72f22b 100644 (file)
--- a/qa/tasks/ceph_objectstore_tool.py
+++ b/qa/tasks/ceph_objectstore_tool.py
@@ -209,8 +209,8 @@ def task(ctx, config):
     manager.raw_cluster_cmd('osd', 'set', 'nodown')
 
     if CRIMSON:
-        CRIMSON_DEVICE_TYPE = manager.get_config('osd', 0, 'seastore_main_device_type')
-        log.info('seastore_main_device_type is {}...'.format(CRIMSON_DEVICE_TYPE))
+        CRIMSON_DEVICE_TYPE = manager.get_config('osd', 0, 'seastore_hot_device_type')
+        log.info('seastore_hot_device_type is {}...'.format(CRIMSON_DEVICE_TYPE))
 
     PGNUM = config.get('pgnum', 12)
     log.info("pgnum: {num}".format(num=PGNUM))