From d57b1af8e64d79e040203fa06098f794048a37c3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 Dec 2018 10:27:53 -0600 Subject: [PATCH] qa/suites: fix bluestore links Signed-off-by: Sage Weil (cherry picked from commit 269910fc8b2bdf64b98534ce525318e108aa9409) --- .../objectstore-ec/bluestore-bitmap.yaml | 1 + qa/cephfs/objectstore-ec/bluestore.yaml | 38 ------------------- qa/objectstore_cephfs/bluestore-bitmap.yaml | 1 + qa/objectstore_cephfs/bluestore.yaml | 1 - .../basic/objectstore/bluestore-bitmap.yaml | 1 + .../basic/objectstore/bluestore.yaml | 1 - .../objectstore/bluestore-bitmap.yaml | 1 + .../objectstore/bluestore.yaml | 1 - .../objectstore/bluestore-bitmap.yaml | 1 + .../objectstore/bluestore.yaml | 1 - .../objectstore/bluestore-bitmap.yaml | 1 + .../objectstore/bluestore.yaml | 1 - .../bluestore-bitmap.yaml | 1 + .../bluestore.yaml | 1 - .../objectstore/bluestore-bitmap.yaml | 1 + .../objectstore/bluestore.yaml | 1 - .../basic/objectstore/bluestore-bitmap.yaml | 1 + .../smoke/basic/objectstore/bluestore.yaml | 1 - .../objectstore/bluestore-bitmap.yaml | 1 + .../stress-split/objectstore/bluestore.yaml | 1 - 20 files changed, 10 insertions(+), 47 deletions(-) create mode 120000 qa/cephfs/objectstore-ec/bluestore-bitmap.yaml delete mode 100644 qa/cephfs/objectstore-ec/bluestore.yaml create mode 120000 qa/objectstore_cephfs/bluestore-bitmap.yaml delete mode 120000 qa/objectstore_cephfs/bluestore.yaml create mode 120000 qa/suites/ceph-deploy/basic/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml create mode 120000 qa/suites/fs/basic_functional/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/fs/basic_functional/objectstore/bluestore.yaml create mode 120000 qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore.yaml create mode 120000 qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml create mode 120000 qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml delete mode 120000 qa/suites/rados/thrash-erasure-code-overwrites/bluestore.yaml create mode 120000 qa/suites/rbd/singleton-bluestore/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/rbd/singleton-bluestore/objectstore/bluestore.yaml create mode 120000 qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/smoke/basic/objectstore/bluestore.yaml create mode 120000 qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore-bitmap.yaml delete mode 120000 qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml diff --git a/qa/cephfs/objectstore-ec/bluestore-bitmap.yaml b/qa/cephfs/objectstore-ec/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..9fb86b9fe7edb --- /dev/null +++ b/qa/cephfs/objectstore-ec/bluestore-bitmap.yaml @@ -0,0 +1 @@ +../../objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/cephfs/objectstore-ec/bluestore.yaml b/qa/cephfs/objectstore-ec/bluestore.yaml deleted file mode 100644 index 19dfeb036ff31..0000000000000 --- a/qa/cephfs/objectstore-ec/bluestore.yaml +++ /dev/null @@ -1,38 +0,0 @@ -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 - # 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_cephfs/bluestore-bitmap.yaml b/qa/objectstore_cephfs/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..951e65ac08314 --- /dev/null +++ b/qa/objectstore_cephfs/bluestore-bitmap.yaml @@ -0,0 +1 @@ +../objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/objectstore_cephfs/bluestore.yaml b/qa/objectstore_cephfs/bluestore.yaml deleted file mode 120000 index ad17c0eb7e57f..0000000000000 --- a/qa/objectstore_cephfs/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/objectstore/bluestore-bitmap.yaml b/qa/suites/ceph-deploy/basic/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/ceph-deploy/basic/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml b/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml deleted file mode 120000 index bd7d7e004a1bf..0000000000000 --- a/qa/suites/ceph-deploy/basic/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/fs/basic_functional/objectstore/bluestore-bitmap.yaml b/qa/suites/fs/basic_functional/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/fs/basic_functional/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/fs/basic_functional/objectstore/bluestore.yaml b/qa/suites/fs/basic_functional/objectstore/bluestore.yaml deleted file mode 120000 index bd7d7e004a1bf..0000000000000 --- a/qa/suites/fs/basic_functional/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore-bitmap.yaml b/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore.yaml b/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore.yaml deleted file mode 120000 index 1728accf9c80c..0000000000000 --- a/qa/suites/fs/bugs/client_trim_caps/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../cephfs/objectstore-ec/bluestore.yaml \ 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 new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml deleted file mode 120000 index bd7d7e004a1bf..0000000000000 --- a/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml b/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..635085f7fc879 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-overwrites/bluestore-bitmap.yaml @@ -0,0 +1 @@ +../thrash-erasure-code/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-overwrites/bluestore.yaml b/qa/suites/rados/thrash-erasure-code-overwrites/bluestore.yaml deleted file mode 120000 index 1249ffda0ee91..0000000000000 --- a/qa/suites/rados/thrash-erasure-code-overwrites/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../thrash-erasure-code/objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/rbd/singleton-bluestore/objectstore/bluestore-bitmap.yaml b/qa/suites/rbd/singleton-bluestore/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/rbd/singleton-bluestore/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/rbd/singleton-bluestore/objectstore/bluestore.yaml b/qa/suites/rbd/singleton-bluestore/objectstore/bluestore.yaml deleted file mode 120000 index bd7d7e004a1bf..0000000000000 --- a/qa/suites/rbd/singleton-bluestore/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../objectstore/bluestore.yaml \ 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 new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/smoke/basic/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/smoke/basic/objectstore/bluestore.yaml b/qa/suites/smoke/basic/objectstore/bluestore.yaml deleted file mode 120000 index bd7d7e004a1bf..0000000000000 --- a/qa/suites/smoke/basic/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../objectstore/bluestore.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml b/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml deleted file mode 120000 index d6445987d072d..0000000000000 --- a/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../objectstore/bluestore.yaml \ No newline at end of file -- 2.39.5