From 711df71790fa069011b6dc66d460999bf55dc2c8 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 4 Feb 2019 20:43:38 +0100 Subject: [PATCH] qa: objectstore snippets for krbd krbd was being tested with filestore, up until recently when the default for osd_objectstore was changed to bluestore. This broke rbd_simple_big.yaml because bluestore_block_size defaults to 10G. Pick up the sepia setting of 90G from bluestore-bitmap.yaml. Run fsx subsuite with both filestore and bluestore. Signed-off-by: Ilya Dryomov --- qa/suites/krbd/basic/bluestore-bitmap.yaml | 1 + qa/suites/krbd/fsx/objectstore/.qa | 1 + .../krbd/fsx/objectstore/bluestore-bitmap.yaml | 1 + .../krbd/fsx/objectstore/filestore-xfs.yaml | 1 + .../krbd/rbd-nomount/bluestore-bitmap.yaml | 1 + .../krbd/rbd-nomount/tasks/krbd_data_pool.yaml | 18 ------------------ qa/suites/krbd/rbd/bluestore-bitmap.yaml | 1 + qa/suites/krbd/singleton/bluestore-bitmap.yaml | 1 + qa/suites/krbd/thrash/bluestore-bitmap.yaml | 1 + qa/suites/krbd/wac/bluestore-bitmap.yaml | 1 + 10 files changed, 9 insertions(+), 18 deletions(-) create mode 120000 qa/suites/krbd/basic/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/fsx/objectstore/.qa create mode 120000 qa/suites/krbd/fsx/objectstore/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/fsx/objectstore/filestore-xfs.yaml create mode 120000 qa/suites/krbd/rbd-nomount/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/rbd/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/singleton/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/thrash/bluestore-bitmap.yaml create mode 120000 qa/suites/krbd/wac/bluestore-bitmap.yaml diff --git a/qa/suites/krbd/basic/bluestore-bitmap.yaml b/qa/suites/krbd/basic/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/basic/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/fsx/objectstore/.qa b/qa/suites/krbd/fsx/objectstore/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/krbd/fsx/objectstore/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/krbd/fsx/objectstore/bluestore-bitmap.yaml b/qa/suites/krbd/fsx/objectstore/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/fsx/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/fsx/objectstore/filestore-xfs.yaml b/qa/suites/krbd/fsx/objectstore/filestore-xfs.yaml new file mode 120000 index 00000000000..41f2a9d14db --- /dev/null +++ b/qa/suites/krbd/fsx/objectstore/filestore-xfs.yaml @@ -0,0 +1 @@ +.qa/objectstore/filestore-xfs.yaml \ No newline at end of file diff --git a/qa/suites/krbd/rbd-nomount/bluestore-bitmap.yaml b/qa/suites/krbd/rbd-nomount/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/rbd-nomount/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/rbd-nomount/tasks/krbd_data_pool.yaml b/qa/suites/krbd/rbd-nomount/tasks/krbd_data_pool.yaml index 1dab39755c8..35b9d67ebff 100644 --- a/qa/suites/krbd/rbd-nomount/tasks/krbd_data_pool.yaml +++ b/qa/suites/krbd/rbd-nomount/tasks/krbd_data_pool.yaml @@ -1,21 +1,3 @@ -overrides: - thrashosds: - bdev_inject_crash: 2 - bdev_inject_crash_probability: .5 - ceph: - fs: xfs - conf: - osd: # force bluestore since it's required for ec overwrites - osd objectstore: bluestore - bluestore block size: 96636764160 - debug bluestore: 30 - debug bdev: 20 - debug bluefs: 20 - debug rocksdb: 10 - enable experimental unrecoverable data corrupting features: "*" - osd debug randomize hobject sort order: false -# this doesn't work with failures bc the log writes are not atomic across the two backends -# bluestore bluefs env mirror: true tasks: - workunit: clients: diff --git a/qa/suites/krbd/rbd/bluestore-bitmap.yaml b/qa/suites/krbd/rbd/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/rbd/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/singleton/bluestore-bitmap.yaml b/qa/suites/krbd/singleton/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/singleton/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/thrash/bluestore-bitmap.yaml b/qa/suites/krbd/thrash/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/thrash/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/krbd/wac/bluestore-bitmap.yaml b/qa/suites/krbd/wac/bluestore-bitmap.yaml new file mode 120000 index 00000000000..a59cf517506 --- /dev/null +++ b/qa/suites/krbd/wac/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file -- 2.39.5