From f390704b4616c837352e7d6a8df91526cb047f0d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Nov 2018 09:55:38 -0600 Subject: [PATCH] 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 --- qa/objectstore/bluestore-bitmap.yaml | 4 ++++ qa/objectstore/{bluestore.yaml => bluestore-stupid.yaml} | 1 + 2 files changed, 5 insertions(+) rename qa/objectstore/{bluestore.yaml => bluestore-stupid.yaml} (97%) diff --git a/qa/objectstore/bluestore-bitmap.yaml b/qa/objectstore/bluestore-bitmap.yaml index 88dca3a21faa5..b18e04bee3269 100644 --- 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 b/qa/objectstore/bluestore-stupid.yaml similarity index 97% rename from qa/objectstore/bluestore.yaml rename to qa/objectstore/bluestore-stupid.yaml index 07817ccb53a35..ca811f131a7bb 100644 --- a/qa/objectstore/bluestore.yaml +++ b/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 -- 2.39.5