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 1939602fa1fc83022b34df9e31ce0a32734c6a8f..666c8ccb98ac6ae0ef38eb0836f38784b9f71caa 100644 (file)
--- 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 (file)
index 0000000..8eea43e
--- /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 (file)
index 0000000..be6484d
--- /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 (file)
index 9a558a5..0000000
--- a/qa/objectstore/filestore.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd objectstore: filestore