qa/objectstore: bluestore -> bluestore-{bitmap,stupid}

The new default is bitmap, so we were testing bitmap twice. Instead, explicitly call out stupid and bitmap cases so a future default change won't break coverage. Signed-off-by: Sage Weil <sage@redhat.com>
ceph · Dec 4, 2018 · f390704 · f390704
1 parent 747c9dc
commit f390704
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/qa/objectstore/bluestore-bitmap.yaml b/qa/objectstore/bluestore-bitmap.yaml
@@ -20,6 +20,8 @@ overrides:
         osd failsafe full ratio: .95
 # this doesn't work with failures bc the log writes are not atomic across the two backends
 #        bluestore bluefs env mirror: true
+        bdev enable discard: true
+        bdev async discard: true
   ceph-deploy:
     fs: xfs
     bluestore: yes
@@ -36,4 +38,6 @@ overrides:
         mon osd backfillfull_ratio: .85
         mon osd nearfull ratio: .8
         osd failsafe full ratio: .95
+        bdev enable discard: true
+        bdev async discard: true
 
diff --git a/qa/objectstore/bluestore.yaml → qa/objectstore/bluestore-stupid.yaml b/qa/objectstore/bluestore.yaml → qa/objectstore/bluestore-stupid.yaml
@@ -12,6 +12,7 @@ overrides:
         debug bluefs: 20
         debug rocksdb: 10
         bluestore fsck on mount: true
+        bluestore allocator: stupid
         # lower the full ratios since we can fill up a 100gb osd so quickly
         mon osd full ratio: .9
         mon osd backfillfull_ratio: .85