From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Dec 2018 16:27:53 +0000 (-0600)
Subject: qa/suites: fix bluestore links
X-Git-Tag: v12.2.12~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d57b1af8e64d79e040203fa06098f794048a37c3;p=ceph.git

qa/suites: fix bluestore links

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 269910fc8b2bdf64b98534ce525318e108aa9409)
---

diff --git a/qa/cephfs/objectstore-ec/bluestore-bitmap.yaml b/qa/cephfs/objectstore-ec/bluestore-bitmap.yaml
new file mode 120000
index 00000000000..9fb86b9fe7e
--- /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 19dfeb036ff..00000000000
--- 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 00000000000..951e65ac083
--- /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 ad17c0eb7e5..00000000000
--- 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 00000000000..a59cf517506
--- /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 bd7d7e004a1..00000000000
--- 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 00000000000..a59cf517506
--- /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 bd7d7e004a1..00000000000
--- 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 00000000000..a59cf517506
--- /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 1728accf9c8..00000000000
--- 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 00000000000..a59cf517506
--- /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 bd7d7e004a1..00000000000
--- 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 00000000000..635085f7fc8
--- /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 1249ffda0ee..00000000000
--- 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 00000000000..a59cf517506
--- /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 bd7d7e004a1..00000000000
--- 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 00000000000..a59cf517506
--- /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 bd7d7e004a1..00000000000
--- 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 00000000000..a59cf517506
--- /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 d6445987d07..00000000000
--- 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