From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Mar 2017 15:54:56 +0000 (-0400)
Subject: qa/objectstore: split filestore into xfs and btrfs variants
X-Git-Tag: v12.0.2~145^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=208675afb131b578912649d6dbf2a34ad7f3826e;p=ceph.git

qa/objectstore: split filestore into xfs and btrfs variants

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/objectstore/bluestore.yaml b/qa/objectstore/bluestore.yaml
index 1939602fa1fc..666c8ccb98ac 100644
--- a/qa/objectstore/bluestore.yaml
+++ b/qa/objectstore/bluestore.yaml
@@ -3,6 +3,7 @@ overrides:
     bdev_inject_crash: 2
     bdev_inject_crash_probability: .5
   ceph:
+    fs: xfs
     conf:
       osd:
         osd objectstore: bluestore
diff --git a/qa/objectstore/filestore-btrfs.yaml b/qa/objectstore/filestore-btrfs.yaml
new file mode 100644
index 000000000000..8eea43e3b95e
--- /dev/null
+++ b/qa/objectstore/filestore-btrfs.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    fs: btrfs
+    conf:
+      osd:
+        osd objectstore: filestore
+        osd op thread timeout: 60
diff --git a/qa/objectstore/filestore-xfs.yaml b/qa/objectstore/filestore-xfs.yaml
new file mode 100644
index 000000000000..be6484d11fd7
--- /dev/null
+++ b/qa/objectstore/filestore-xfs.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    fs: xfs
+    conf:
+      osd:
+        osd objectstore: filestore
+        osd sloppy crc: true
diff --git a/qa/objectstore/filestore.yaml b/qa/objectstore/filestore.yaml
deleted file mode 100644
index 9a558a5d386b..000000000000
--- a/qa/objectstore/filestore.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd objectstore: filestore