From: Jason Dillaman Date: Wed, 3 Mar 2021 19:26:38 +0000 (-0500) Subject: qa/suites: move RADOS tests to use new debug log objectstores X-Git-Tag: v17.1.0~2704^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=103243725f28cf69252d35cdb7a5985ed260697c;p=ceph.git qa/suites: move RADOS tests to use new debug log objectstores This will retain the debug log settings for all RADOS suites that were previously symlinked to the 'objectstore' directory. The next commit will reduce the debug log level for the original 'objectstore' directory for the remainder of tests. Signed-off-by: Jason Dillaman --- diff --git a/qa/objectstore_debug/bluestore-bitmap.yaml b/qa/objectstore_debug/bluestore-bitmap.yaml new file mode 100644 index 000000000000..b18e04bee326 --- /dev/null +++ b/qa/objectstore_debug/bluestore-bitmap.yaml @@ -0,0 +1,43 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + bluestore allocator: bitmap + # 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 +# 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 + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + # 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 + bdev enable discard: true + bdev async discard: true + diff --git a/qa/objectstore_debug/bluestore-comp-lz4.yaml b/qa/objectstore_debug/bluestore-comp-lz4.yaml new file mode 100644 index 000000000000..46f993e686c2 --- /dev/null +++ b/qa/objectstore_debug/bluestore-comp-lz4.yaml @@ -0,0 +1,24 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + 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: lz4 + # 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 + +# this doesn't work with failures bc the log writes are not atomic across the two backends +# bluestore bluefs env mirror: true diff --git a/qa/objectstore_debug/bluestore-comp-snappy.yaml b/qa/objectstore_debug/bluestore-comp-snappy.yaml new file mode 100644 index 000000000000..b5d58414e3f8 --- /dev/null +++ b/qa/objectstore_debug/bluestore-comp-snappy.yaml @@ -0,0 +1,24 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + 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 + +# this doesn't work with failures bc the log writes are not atomic across the two backends +# bluestore bluefs env mirror: true diff --git a/qa/objectstore_debug/bluestore-comp-zlib.yaml b/qa/objectstore_debug/bluestore-comp-zlib.yaml new file mode 100644 index 000000000000..b47ebbb7c62e --- /dev/null +++ b/qa/objectstore_debug/bluestore-comp-zlib.yaml @@ -0,0 +1,24 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + 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: zlib + # 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 + +# this doesn't work with failures bc the log writes are not atomic across the two backends +# bluestore bluefs env mirror: true diff --git a/qa/objectstore_debug/bluestore-comp-zstd.yaml b/qa/objectstore_debug/bluestore-comp-zstd.yaml new file mode 100644 index 000000000000..e2f5e4e5ba62 --- /dev/null +++ b/qa/objectstore_debug/bluestore-comp-zstd.yaml @@ -0,0 +1,24 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + 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: zstd + # 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 + +# this doesn't work with failures bc the log writes are not atomic across the two backends +# bluestore bluefs env mirror: true diff --git a/qa/objectstore_debug/bluestore-hybrid.yaml b/qa/objectstore_debug/bluestore-hybrid.yaml new file mode 100644 index 000000000000..68b9bc4279ff --- /dev/null +++ b/qa/objectstore_debug/bluestore-hybrid.yaml @@ -0,0 +1,40 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + bluestore allocator: hybrid + bluefs allocator: hybrid + # 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 +# this doesn't work with failures bc the log writes are not atomic across the two backends +# bluestore bluefs env mirror: true + ceph-deploy: + fs: xfs + bluestore: yes + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + # 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 + diff --git a/qa/objectstore_debug/bluestore-low-osd-mem-target.yaml b/qa/objectstore_debug/bluestore-low-osd-mem-target.yaml new file mode 100644 index 000000000000..b2a49790bc3d --- /dev/null +++ b/qa/objectstore_debug/bluestore-low-osd-mem-target.yaml @@ -0,0 +1,25 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + osd memory target: 1610612736 # reduced to 1.5_G + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + # 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 +# 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 + diff --git a/qa/objectstore_debug/bluestore-stupid.yaml b/qa/objectstore_debug/bluestore-stupid.yaml new file mode 100644 index 000000000000..ca811f131a7b --- /dev/null +++ b/qa/objectstore_debug/bluestore-stupid.yaml @@ -0,0 +1,43 @@ +overrides: + thrashosds: + bdev_inject_crash: 2 + bdev_inject_crash_probability: .5 + ceph: + fs: xfs + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + 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 + mon osd nearfull ratio: .8 + 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 + conf: + osd: + osd objectstore: bluestore + bluestore block size: 96636764160 + debug bluestore: 20 + debug bluefs: 20 + debug rocksdb: 10 + bluestore fsck on mount: true + # 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 + bdev enable discard: true + bdev async discard: true + diff --git a/qa/objectstore_debug/filestore-xfs.yaml b/qa/objectstore_debug/filestore-xfs.yaml new file mode 100644 index 000000000000..f7aa0dd79c6a --- /dev/null +++ b/qa/objectstore_debug/filestore-xfs.yaml @@ -0,0 +1,15 @@ +overrides: + ceph: + fs: xfs + conf: + osd: + osd objectstore: filestore + osd sloppy crc: true + ceph-deploy: + fs: xfs + filestore: True + conf: + osd: + osd objectstore: filestore + osd sloppy crc: true + diff --git a/qa/suites/big/rados-thrash/objectstore b/qa/suites/big/rados-thrash/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/big/rados-thrash/objectstore +++ b/qa/suites/big/rados-thrash/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/basic/objectstore b/qa/suites/rados/basic/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/basic/objectstore +++ b/qa/suites/rados/basic/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/mgr/objectstore b/qa/suites/rados/mgr/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/mgr/objectstore +++ b/qa/suites/rados/mgr/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/monthrash/objectstore b/qa/suites/rados/monthrash/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/monthrash/objectstore +++ b/qa/suites/rados/monthrash/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/multimon/objectstore b/qa/suites/rados/multimon/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/multimon/objectstore +++ b/qa/suites/rados/multimon/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml index a59cf5175069..66cf2bc75937 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml @@ -1 +1 @@ -.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml index 4fb2ff6c32d0..da2e2598c338 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-lz4.yaml @@ -1 +1 @@ -.qa/objectstore/bluestore-comp-lz4.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore-comp-lz4.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml index 888caf55f4ce..f75b0e1b48e2 120000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp-snappy.yaml @@ -1 +1 @@ -.qa/objectstore/bluestore-comp-snappy.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore-comp-snappy.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton/objectstore b/qa/suites/rados/singleton/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/singleton/objectstore +++ b/qa/suites/rados/singleton/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-big/objectstore b/qa/suites/rados/thrash-erasure-code-big/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/thrash-erasure-code-big/objectstore +++ b/qa/suites/rados/thrash-erasure-code-big/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-isa/objectstore b/qa/suites/rados/thrash-erasure-code-isa/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/thrash-erasure-code-isa/objectstore +++ b/qa/suites/rados/thrash-erasure-code-isa/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-shec/objectstore b/qa/suites/rados/thrash-erasure-code-shec/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/thrash-erasure-code-shec/objectstore +++ b/qa/suites/rados/thrash-erasure-code-shec/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code/objectstore b/qa/suites/rados/thrash-erasure-code/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/thrash-erasure-code/objectstore +++ b/qa/suites/rados/thrash-erasure-code/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/thrash/objectstore b/qa/suites/rados/thrash/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/thrash/objectstore +++ b/qa/suites/rados/thrash/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/rados/verify/objectstore b/qa/suites/rados/verify/objectstore index c40bd3261453..848c65f9e131 120000 --- a/qa/suites/rados/verify/objectstore +++ b/qa/suites/rados/verify/objectstore @@ -1 +1 @@ -.qa/objectstore \ No newline at end of file +.qa/objectstore_debug \ No newline at end of file diff --git a/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml b/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml index a59cf5175069..66cf2bc75937 120000 --- a/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml +++ b/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml @@ -1 +1 @@ -.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml index a59cf5175069..66cf2bc75937 120000 --- a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml +++ b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml @@ -1 +1 @@ -.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file +.qa/objectstore_debug/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/filestore-xfs.yaml index 41f2a9d14db8..d83049f3c3e9 120000 --- a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/filestore-xfs.yaml +++ b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/filestore-xfs.yaml @@ -1 +1 @@ -.qa/objectstore/filestore-xfs.yaml \ No newline at end of file +.qa/objectstore_debug/filestore-xfs.yaml \ No newline at end of file