From: John Spray <john.spray@redhat.com>
Date: Sat, 15 Apr 2017 10:31:41 +0000 (+0100)
Subject: qa/suites/fs: more meaningful names for sub suites
X-Git-Tag: v12.0.3~275^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea688a6d466f8e3018b1991d3c661d974d19df46;p=ceph.git

qa/suites/fs: more meaningful names for sub suites

The "recovery" sub suite was originally tests for
client/mds recovery in certain failure cases, it has
since grown to include lots of unit testing of
various features using CephFSTestCase.

The "basic" suite is now specifically just running workloads
now that I've moved out the smaller functional tests.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/suites/fs/basic/% b/qa/suites/fs/basic/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/basic/begin.yaml b/qa/suites/fs/basic/begin.yaml
deleted file mode 120000
index 0c4ae31e919..00000000000
--- a/qa/suites/fs/basic/begin.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/clusters/fixed-2-ucephfs.yaml b/qa/suites/fs/basic/clusters/fixed-2-ucephfs.yaml
deleted file mode 120000
index c25795fb494..00000000000
--- a/qa/suites/fs/basic/clusters/fixed-2-ucephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/clusters/fixed-2-ucephfs.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/inline/no.yaml b/qa/suites/fs/basic/inline/no.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/basic/inline/yes.yaml b/qa/suites/fs/basic/inline/yes.yaml
deleted file mode 100644
index ae5222f6bcb..00000000000
--- a/qa/suites/fs/basic/inline/yes.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph mds set inline_data true --yes-i-really-mean-it
diff --git a/qa/suites/fs/basic/mount/fuse.yaml b/qa/suites/fs/basic/mount/fuse.yaml
deleted file mode 120000
index af9ee0ab798..00000000000
--- a/qa/suites/fs/basic/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/mount/fuse.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/objectstore b/qa/suites/fs/basic/objectstore
deleted file mode 120000
index 4c8ebadfde8..00000000000
--- a/qa/suites/fs/basic/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/fs/basic/omap_limit/10.yaml b/qa/suites/fs/basic/omap_limit/10.yaml
deleted file mode 100644
index 0cd2c6f89e5..00000000000
--- a/qa/suites/fs/basic/omap_limit/10.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd_max_omap_entries_per_request: 10
\ No newline at end of file
diff --git a/qa/suites/fs/basic/omap_limit/10000.yaml b/qa/suites/fs/basic/omap_limit/10000.yaml
deleted file mode 100644
index 0c7e4cf9868..00000000000
--- a/qa/suites/fs/basic/omap_limit/10000.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd_max_omap_entries_per_request: 10000
\ No newline at end of file
diff --git a/qa/suites/fs/basic/overrides/+ b/qa/suites/fs/basic/overrides/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/basic/overrides/debug.yaml b/qa/suites/fs/basic/overrides/debug.yaml
deleted file mode 120000
index 9bc8eb1e77d..00000000000
--- a/qa/suites/fs/basic/overrides/debug.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/debug.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/overrides/frag_enable.yaml b/qa/suites/fs/basic/overrides/frag_enable.yaml
deleted file mode 120000
index e9b2d64d0c8..00000000000
--- a/qa/suites/fs/basic/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/basic/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000
index a26a6579c33..00000000000
--- a/qa/suites/fs/basic/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644
index 1e71bb401ae..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_misc.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644
index fac769ed5d9..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - fs/misc
-
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml
deleted file mode 100644
index c9de5c38637..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/test_o_trunc.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml
deleted file mode 100644
index bfed71c1b51..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - fs/norstats
-
-overrides:
-  ceph:
-    conf:
-      client:
-        client dirsize rbytes: false
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 120000
index 8f2e88a01ee..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 120000
index 87c056d1b5c..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 120000
index 3528badeda1..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 120000
index dc3fd3031b2..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
deleted file mode 100644
index b16cfb17d60..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - suites/fsx.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml
deleted file mode 100644
index 7efa1adb82d..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsync-tester.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml
deleted file mode 100644
index 8d4c27108b2..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iogen.sh
-
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
deleted file mode 100644
index 9270f3c51e2..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644
index 7cb0b0f6e6b..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        debug ms: 1
-        debug client: 20
-        fuse set user groups: true
-        fuse default permissions: false
-      mds:
-        debug ms: 1
-        debug mds: 20
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/pjd.sh
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml
deleted file mode 100644
index b47b5656914..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        ms_inject_delay_probability: 1
-        ms_inject_delay_type: osd
-        ms_inject_delay_max: 5
-        client_oc_max_dirty_age: 1
-tasks:
-- exec:
-    client.0:
-      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
-      - sleep 2
-      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo
diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 120000
index 55a4c85a1bc..00000000000
--- a/qa/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/cfuse_workunit_trivial_sync.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/qa/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
deleted file mode 120000
index 582815a106c..00000000000
--- a/qa/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/tasks/libcephfs_interface_tests.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/% b/qa/suites/fs/basic_functional/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/fs/basic_functional/begin.yaml b/qa/suites/fs/basic_functional/begin.yaml
new file mode 120000
index 00000000000..0c4ae31e919
--- /dev/null
+++ b/qa/suites/fs/basic_functional/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml b/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml
new file mode 100644
index 00000000000..f9e423e2fc3
--- /dev/null
+++ b/qa/suites/fs/basic_functional/clusters/4-remote-clients.yaml
@@ -0,0 +1,10 @@
+roles:
+- [mon.a, mgr.x, osd.0, mds.a, mds.b, client.1, client.2, client.3]
+- [client.0, osd.1, osd.2]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
diff --git a/qa/suites/fs/basic_functional/mount/fuse.yaml b/qa/suites/fs/basic_functional/mount/fuse.yaml
new file mode 120000
index 00000000000..af9ee0ab798
--- /dev/null
+++ b/qa/suites/fs/basic_functional/mount/fuse.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/fuse.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
new file mode 120000
index 00000000000..bd7d7e004a1
--- /dev/null
+++ b/qa/suites/fs/basic_functional/objectstore/bluestore.yaml
@@ -0,0 +1 @@
+../../../../objectstore/bluestore.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/overrides/+ b/qa/suites/fs/basic_functional/overrides/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/fs/basic_functional/overrides/debug.yaml b/qa/suites/fs/basic_functional/overrides/debug.yaml
new file mode 120000
index 00000000000..9bc8eb1e77d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/overrides/debug.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/debug.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/overrides/frag_enable.yaml b/qa/suites/fs/basic_functional/overrides/frag_enable.yaml
new file mode 120000
index 00000000000..e9b2d64d0c8
--- /dev/null
+++ b/qa/suites/fs/basic_functional/overrides/frag_enable.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/overrides/no_client_pidfile.yaml b/qa/suites/fs/basic_functional/overrides/no_client_pidfile.yaml
new file mode 120000
index 00000000000..7b8e4bdd15c
--- /dev/null
+++ b/qa/suites/fs/basic_functional/overrides/no_client_pidfile.yaml
@@ -0,0 +1 @@
+../../../../overrides/no_client_pidfile.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/basic_functional/overrides/whitelist_wrongly_marked_down.yaml
new file mode 120000
index 00000000000..a26a6579c33
--- /dev/null
+++ b/qa/suites/fs/basic_functional/overrides/whitelist_wrongly_marked_down.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/asok_dump_tree.yaml b/qa/suites/fs/basic_functional/tasks/asok_dump_tree.yaml
new file mode 100644
index 00000000000..7fa561470b6
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/asok_dump_tree.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephfs_test_runner:
+    modules:
+      - tasks.cephfs.test_dump_tree
diff --git a/qa/suites/fs/basic_functional/tasks/auto-repair.yaml b/qa/suites/fs/basic_functional/tasks/auto-repair.yaml
new file mode 100644
index 00000000000..629804ec752
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/auto-repair.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - force file system read-only
+      - bad backtrace
+      - MDS in read-only mode
+
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_auto_repair
diff --git a/qa/suites/fs/basic_functional/tasks/backtrace.yaml b/qa/suites/fs/basic_functional/tasks/backtrace.yaml
new file mode 100644
index 00000000000..d740a5f6f75
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/backtrace.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_backtrace
diff --git a/qa/suites/fs/basic_functional/tasks/cap-flush.yaml b/qa/suites/fs/basic_functional/tasks/cap-flush.yaml
new file mode 100644
index 00000000000..0d26dc9e6b5
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cap-flush.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_cap_flush
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml
new file mode 100644
index 00000000000..3b2714689f0
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - Scrub error on inode
+      - Behind on trimming
+      - Metadata damage detected
+    conf:
+      mds:
+        mds log max segments: 1
+        mds cache max size: 1000
+tasks:
+- cephfs_test_runner:
+    modules:
+      - tasks.cephfs.test_scrub_checks
diff --git a/qa/suites/fs/basic_functional/tasks/cfuse_workunit_quota.yaml b/qa/suites/fs/basic_functional/tasks/cfuse_workunit_quota.yaml
new file mode 100644
index 00000000000..7908bc88c4b
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cfuse_workunit_quota.yaml
@@ -0,0 +1,12 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - fs/quota
+
+overrides:
+  ceph:
+    conf:
+      client:
+        client quota: true
diff --git a/qa/suites/fs/basic_functional/tasks/client-limits.yaml b/qa/suites/fs/basic_functional/tasks/client-limits.yaml
new file mode 100644
index 00000000000..4483dbb6f8f
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/client-limits.yaml
@@ -0,0 +1,16 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - responding to mclientcaps\(revoke\)
+      - not advance its oldest_client_tid
+      - failing to advance its oldest client/flush tid
+      - Too many inodes in cache
+      - failing to respond to cache pressure
+      - slow requests are blocked
+      - failing to respond to capability release
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_client_limits
diff --git a/qa/suites/fs/basic_functional/tasks/client-readahad.yaml b/qa/suites/fs/basic_functional/tasks/client-readahad.yaml
new file mode 100644
index 00000000000..1d178e5286d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/client-readahad.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_readahead
diff --git a/qa/suites/fs/basic_functional/tasks/client-recovery.yaml b/qa/suites/fs/basic_functional/tasks/client-recovery.yaml
new file mode 100644
index 00000000000..1433ee1d819
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/client-recovery.yaml
@@ -0,0 +1,13 @@
+
+# The task interferes with the network, so we need
+# to permit OSDs to complain about that.
+overrides:
+  ceph:
+    log-whitelist:
+      - wrongly marked me down
+      - slow request
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_client_recovery
diff --git a/qa/suites/fs/basic_functional/tasks/config-commands.yaml b/qa/suites/fs/basic_functional/tasks/config-commands.yaml
new file mode 100644
index 00000000000..2f51801d6cb
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/config-commands.yaml
@@ -0,0 +1,11 @@
+
+overrides:
+  ceph:
+    conf:
+      global:
+        lockdep: true
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_config_commands
diff --git a/qa/suites/fs/basic_functional/tasks/damage.yaml b/qa/suites/fs/basic_functional/tasks/damage.yaml
new file mode 100644
index 00000000000..3f4aac9e5df
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/damage.yaml
@@ -0,0 +1,25 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - bad backtrace
+      - object missing on disk
+      - error reading table object
+      - error reading sessionmap
+      - Error loading MDS rank
+      - missing journal object
+      - Error recovering journal
+      - error decoding table object
+      - failed to read JournalPointer
+      - Corrupt directory entry
+      - Corrupt fnode header
+      - corrupt sessionmap header
+      - Corrupt dentry
+      - Scrub error on inode
+      - Metadata damage detected
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_damage
+
diff --git a/qa/suites/fs/basic_functional/tasks/data-scan.yaml b/qa/suites/fs/basic_functional/tasks/data-scan.yaml
new file mode 100644
index 00000000000..9428624e094
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/data-scan.yaml
@@ -0,0 +1,17 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - bad backtrace
+      - object missing on disk
+      - error reading table object
+      - error reading sessionmap
+      - unmatched fragstat
+      - was unreadable, recreating it now
+      - Scrub error on inode
+      - Metadata damage detected
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_data_scan
diff --git a/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml b/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml
new file mode 100644
index 00000000000..b92cf10529f
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml
@@ -0,0 +1,14 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - inode wrongly marked free
+      - bad backtrace on inode
+      - inode table repaired for inode
+      - Scrub error on inode
+      - Metadata damage detected
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_forward_scrub
diff --git a/qa/suites/fs/basic_functional/tasks/fragment.yaml b/qa/suites/fs/basic_functional/tasks/fragment.yaml
new file mode 100644
index 00000000000..482caad8515
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/fragment.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_fragment
diff --git a/qa/suites/fs/basic_functional/tasks/journal-repair.yaml b/qa/suites/fs/basic_functional/tasks/journal-repair.yaml
new file mode 100644
index 00000000000..324ff75dfe9
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/journal-repair.yaml
@@ -0,0 +1,14 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - bad backtrace on dir ino
+      - error reading table object
+      - Metadata damage detected
+      - slow requests are blocked
+      - Behind on trimming
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_journal_repair
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
new file mode 100644
index 00000000000..aaffa033811
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_java.yaml
@@ -0,0 +1,14 @@
+
+os_type: ubuntu
+os_version: "14.04"
+
+overrides:
+  ceph-fuse:
+    disabled: true
+  kclient:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs-java/test.sh
diff --git a/qa/suites/fs/basic_functional/tasks/libcephfs_python.yaml b/qa/suites/fs/basic_functional/tasks/libcephfs_python.yaml
new file mode 100644
index 00000000000..e5cbb14ba62
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/libcephfs_python.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph-fuse:
+    disabled: true
+  kclient:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - fs/test_python.sh
diff --git a/qa/suites/fs/basic_functional/tasks/mds-flush.yaml b/qa/suites/fs/basic_functional/tasks/mds-flush.yaml
new file mode 100644
index 00000000000..d59a8ad5fc9
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/mds-flush.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_flush
diff --git a/qa/suites/fs/basic_functional/tasks/mds-full.yaml b/qa/suites/fs/basic_functional/tasks/mds-full.yaml
new file mode 100644
index 00000000000..6865d83e807
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/mds-full.yaml
@@ -0,0 +1,27 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - OSD full dropping all updates
+      - OSD near full
+      - failsafe engaged, dropping updates
+      - failsafe disengaged, no longer dropping
+      - is full \(reached quota
+    conf:
+      osd:
+        osd mon report interval max: 5
+        osd objectstore: memstore
+        memstore device bytes: 100000000
+      client.0:
+        debug client: 20
+        debug objecter: 20
+        debug objectcacher: 20
+      client.1:
+        debug client: 20
+        debug objecter: 20
+        debug objectcacher: 20
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_full
diff --git a/qa/suites/fs/basic_functional/tasks/mds_creation_retry.yaml b/qa/suites/fs/basic_functional/tasks/mds_creation_retry.yaml
new file mode 100644
index 00000000000..fd23aa8bad0
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/mds_creation_retry.yaml
@@ -0,0 +1,6 @@
+tasks:
+-mds_creation_failure:
+- workunit:
+    clients:
+      all: [fs/misc/trivial_sync.sh]
+
diff --git a/qa/suites/fs/basic_functional/tasks/pool-perm.yaml b/qa/suites/fs/basic_functional/tasks/pool-perm.yaml
new file mode 100644
index 00000000000..f220626df62
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/pool-perm.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_pool_perm
diff --git a/qa/suites/fs/basic_functional/tasks/quota.yaml b/qa/suites/fs/basic_functional/tasks/quota.yaml
new file mode 100644
index 00000000000..89b10ce2ede
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/quota.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_quota
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap.yaml b/qa/suites/fs/basic_functional/tasks/sessionmap.yaml
new file mode 100644
index 00000000000..054fdb70792
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/sessionmap.yaml
@@ -0,0 +1,13 @@
+
+overrides:
+  ceph:
+    conf:
+      global:
+        ms type: simple
+    log-whitelist:
+      - client session with invalid root
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/fs/basic_functional/tasks/strays.yaml b/qa/suites/fs/basic_functional/tasks/strays.yaml
new file mode 100644
index 00000000000..2809fc141bf
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/strays.yaml
@@ -0,0 +1,5 @@
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_strays
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client.yaml b/qa/suites/fs/basic_functional/tasks/volume-client.yaml
new file mode 100644
index 00000000000..e8c850a05cd
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client.yaml
@@ -0,0 +1,11 @@
+
+overrides:
+  ceph:
+    conf:
+      global:
+        ms type: simple
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_volume_client
diff --git a/qa/suites/fs/basic_workload/% b/qa/suites/fs/basic_workload/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/fs/basic_workload/begin.yaml b/qa/suites/fs/basic_workload/begin.yaml
new file mode 120000
index 00000000000..0c4ae31e919
--- /dev/null
+++ b/qa/suites/fs/basic_workload/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml b/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml
new file mode 120000
index 00000000000..c25795fb494
--- /dev/null
+++ b/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/fixed-2-ucephfs.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/inline/no.yaml b/qa/suites/fs/basic_workload/inline/no.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/fs/basic_workload/inline/yes.yaml b/qa/suites/fs/basic_workload/inline/yes.yaml
new file mode 100644
index 00000000000..ae5222f6bcb
--- /dev/null
+++ b/qa/suites/fs/basic_workload/inline/yes.yaml
@@ -0,0 +1,4 @@
+tasks:
+- exec:
+    client.0:
+      - sudo ceph mds set inline_data true --yes-i-really-mean-it
diff --git a/qa/suites/fs/basic_workload/mount/fuse.yaml b/qa/suites/fs/basic_workload/mount/fuse.yaml
new file mode 120000
index 00000000000..af9ee0ab798
--- /dev/null
+++ b/qa/suites/fs/basic_workload/mount/fuse.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/fuse.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/objectstore b/qa/suites/fs/basic_workload/objectstore
new file mode 120000
index 00000000000..4c8ebadfde8
--- /dev/null
+++ b/qa/suites/fs/basic_workload/objectstore
@@ -0,0 +1 @@
+../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/omap_limit/10.yaml b/qa/suites/fs/basic_workload/omap_limit/10.yaml
new file mode 100644
index 00000000000..0cd2c6f89e5
--- /dev/null
+++ b/qa/suites/fs/basic_workload/omap_limit/10.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd_max_omap_entries_per_request: 10
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/omap_limit/10000.yaml b/qa/suites/fs/basic_workload/omap_limit/10000.yaml
new file mode 100644
index 00000000000..0c7e4cf9868
--- /dev/null
+++ b/qa/suites/fs/basic_workload/omap_limit/10000.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd_max_omap_entries_per_request: 10000
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/overrides/+ b/qa/suites/fs/basic_workload/overrides/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/fs/basic_workload/overrides/debug.yaml b/qa/suites/fs/basic_workload/overrides/debug.yaml
new file mode 120000
index 00000000000..9bc8eb1e77d
--- /dev/null
+++ b/qa/suites/fs/basic_workload/overrides/debug.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/debug.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/overrides/frag_enable.yaml b/qa/suites/fs/basic_workload/overrides/frag_enable.yaml
new file mode 120000
index 00000000000..e9b2d64d0c8
--- /dev/null
+++ b/qa/suites/fs/basic_workload/overrides/frag_enable.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/basic_workload/overrides/whitelist_wrongly_marked_down.yaml
new file mode 120000
index 00000000000..a26a6579c33
--- /dev/null
+++ b/qa/suites/fs/basic_workload/overrides/whitelist_wrongly_marked_down.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml
new file mode 100644
index 00000000000..1e71bb401ae
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        fuse_default_permissions: 0
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - kernel_untar_build.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml
new file mode 100644
index 00000000000..fac769ed5d9
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml
@@ -0,0 +1,11 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - fs/misc
+
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml
new file mode 100644
index 00000000000..c9de5c38637
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - fs/test_o_trunc.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_norstats.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_norstats.yaml
new file mode 100644
index 00000000000..bfed71c1b51
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_norstats.yaml
@@ -0,0 +1,16 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - fs/norstats
+
+overrides:
+  ceph:
+    conf:
+      client:
+        client dirsize rbytes: false
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 120000
index 00000000000..8f2e88a01ee
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 120000
index 00000000000..87c056d1b5c
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 120000
index 00000000000..3528badeda1
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 120000
index 00000000000..dc3fd3031b2
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
new file mode 100644
index 00000000000..b16cfb17d60
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
@@ -0,0 +1,9 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - suites/fsx.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml
new file mode 100644
index 00000000000..7efa1adb82d
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/fsync-tester.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml
new file mode 100644
index 00000000000..8d4c27108b2
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/iogen.sh
+
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml
new file mode 100644
index 00000000000..9270f3c51e2
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/iozone.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
new file mode 100644
index 00000000000..7cb0b0f6e6b
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
@@ -0,0 +1,16 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        debug ms: 1
+        debug client: 20
+        fuse set user groups: true
+        fuse default permissions: false
+      mds:
+        debug ms: 1
+        debug mds: 20
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/pjd.sh
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml
new file mode 100644
index 00000000000..b47b5656914
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        ms_inject_delay_probability: 1
+        ms_inject_delay_type: osd
+        ms_inject_delay_max: 5
+        client_oc_max_dirty_age: 1
+tasks:
+- exec:
+    client.0:
+      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
+      - sleep 2
+      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo
diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml
new file mode 120000
index 00000000000..55a4c85a1bc
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_trivial_sync.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_workload/tasks/libcephfs_interface_tests.yaml b/qa/suites/fs/basic_workload/tasks/libcephfs_interface_tests.yaml
new file mode 120000
index 00000000000..582815a106c
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/libcephfs_interface_tests.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/% b/qa/suites/fs/recovery/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/recovery/begin.yaml b/qa/suites/fs/recovery/begin.yaml
deleted file mode 120000
index 0c4ae31e919..00000000000
--- a/qa/suites/fs/recovery/begin.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml b/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
deleted file mode 100644
index f9e423e2fc3..00000000000
--- a/qa/suites/fs/recovery/clusters/4-remote-clients.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, mds.a, mds.b, client.1, client.2, client.3]
-- [client.0, osd.1, osd.2]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G
diff --git a/qa/suites/fs/recovery/mount/fuse.yaml b/qa/suites/fs/recovery/mount/fuse.yaml
deleted file mode 120000
index af9ee0ab798..00000000000
--- a/qa/suites/fs/recovery/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/mount/fuse.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/objectstore/bluestore.yaml b/qa/suites/fs/recovery/objectstore/bluestore.yaml
deleted file mode 120000
index bd7d7e004a1..00000000000
--- a/qa/suites/fs/recovery/objectstore/bluestore.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../objectstore/bluestore.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/overrides/+ b/qa/suites/fs/recovery/overrides/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/recovery/overrides/debug.yaml b/qa/suites/fs/recovery/overrides/debug.yaml
deleted file mode 120000
index 9bc8eb1e77d..00000000000
--- a/qa/suites/fs/recovery/overrides/debug.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/debug.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/overrides/frag_enable.yaml b/qa/suites/fs/recovery/overrides/frag_enable.yaml
deleted file mode 120000
index e9b2d64d0c8..00000000000
--- a/qa/suites/fs/recovery/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/overrides/no_client_pidfile.yaml b/qa/suites/fs/recovery/overrides/no_client_pidfile.yaml
deleted file mode 120000
index 7b8e4bdd15c..00000000000
--- a/qa/suites/fs/recovery/overrides/no_client_pidfile.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../overrides/no_client_pidfile.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/recovery/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000
index a26a6579c33..00000000000
--- a/qa/suites/fs/recovery/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml b/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml
deleted file mode 100644
index 7fa561470b6..00000000000
--- a/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_dump_tree
diff --git a/qa/suites/fs/recovery/tasks/auto-repair.yaml b/qa/suites/fs/recovery/tasks/auto-repair.yaml
deleted file mode 100644
index 629804ec752..00000000000
--- a/qa/suites/fs/recovery/tasks/auto-repair.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - force file system read-only
-      - bad backtrace
-      - MDS in read-only mode
-
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_auto_repair
diff --git a/qa/suites/fs/recovery/tasks/backtrace.yaml b/qa/suites/fs/recovery/tasks/backtrace.yaml
deleted file mode 100644
index d740a5f6f75..00000000000
--- a/qa/suites/fs/recovery/tasks/backtrace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_backtrace
diff --git a/qa/suites/fs/recovery/tasks/cap-flush.yaml b/qa/suites/fs/recovery/tasks/cap-flush.yaml
deleted file mode 100644
index 0d26dc9e6b5..00000000000
--- a/qa/suites/fs/recovery/tasks/cap-flush.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_cap_flush
diff --git a/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml
deleted file mode 100644
index 3b2714689f0..00000000000
--- a/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - Scrub error on inode
-      - Behind on trimming
-      - Metadata damage detected
-    conf:
-      mds:
-        mds log max segments: 1
-        mds cache max size: 1000
-tasks:
-- cephfs_test_runner:
-    modules:
-      - tasks.cephfs.test_scrub_checks
diff --git a/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml b/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml
deleted file mode 100644
index 7908bc88c4b..00000000000
--- a/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - fs/quota
-
-overrides:
-  ceph:
-    conf:
-      client:
-        client quota: true
diff --git a/qa/suites/fs/recovery/tasks/client-limits.yaml b/qa/suites/fs/recovery/tasks/client-limits.yaml
deleted file mode 100644
index 4483dbb6f8f..00000000000
--- a/qa/suites/fs/recovery/tasks/client-limits.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - responding to mclientcaps\(revoke\)
-      - not advance its oldest_client_tid
-      - failing to advance its oldest client/flush tid
-      - Too many inodes in cache
-      - failing to respond to cache pressure
-      - slow requests are blocked
-      - failing to respond to capability release
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_client_limits
diff --git a/qa/suites/fs/recovery/tasks/client-readahad.yaml b/qa/suites/fs/recovery/tasks/client-readahad.yaml
deleted file mode 100644
index 1d178e5286d..00000000000
--- a/qa/suites/fs/recovery/tasks/client-readahad.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_readahead
diff --git a/qa/suites/fs/recovery/tasks/client-recovery.yaml b/qa/suites/fs/recovery/tasks/client-recovery.yaml
deleted file mode 100644
index 1433ee1d819..00000000000
--- a/qa/suites/fs/recovery/tasks/client-recovery.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# The task interferes with the network, so we need
-# to permit OSDs to complain about that.
-overrides:
-  ceph:
-    log-whitelist:
-      - wrongly marked me down
-      - slow request
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_client_recovery
diff --git a/qa/suites/fs/recovery/tasks/config-commands.yaml b/qa/suites/fs/recovery/tasks/config-commands.yaml
deleted file mode 100644
index 2f51801d6cb..00000000000
--- a/qa/suites/fs/recovery/tasks/config-commands.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        lockdep: true
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_config_commands
diff --git a/qa/suites/fs/recovery/tasks/damage.yaml b/qa/suites/fs/recovery/tasks/damage.yaml
deleted file mode 100644
index 3f4aac9e5df..00000000000
--- a/qa/suites/fs/recovery/tasks/damage.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - bad backtrace
-      - object missing on disk
-      - error reading table object
-      - error reading sessionmap
-      - Error loading MDS rank
-      - missing journal object
-      - Error recovering journal
-      - error decoding table object
-      - failed to read JournalPointer
-      - Corrupt directory entry
-      - Corrupt fnode header
-      - corrupt sessionmap header
-      - Corrupt dentry
-      - Scrub error on inode
-      - Metadata damage detected
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_damage
-
diff --git a/qa/suites/fs/recovery/tasks/data-scan.yaml b/qa/suites/fs/recovery/tasks/data-scan.yaml
deleted file mode 100644
index 9428624e094..00000000000
--- a/qa/suites/fs/recovery/tasks/data-scan.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - bad backtrace
-      - object missing on disk
-      - error reading table object
-      - error reading sessionmap
-      - unmatched fragstat
-      - was unreadable, recreating it now
-      - Scrub error on inode
-      - Metadata damage detected
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_data_scan
diff --git a/qa/suites/fs/recovery/tasks/forward-scrub.yaml b/qa/suites/fs/recovery/tasks/forward-scrub.yaml
deleted file mode 100644
index b92cf10529f..00000000000
--- a/qa/suites/fs/recovery/tasks/forward-scrub.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - inode wrongly marked free
-      - bad backtrace on inode
-      - inode table repaired for inode
-      - Scrub error on inode
-      - Metadata damage detected
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_forward_scrub
diff --git a/qa/suites/fs/recovery/tasks/fragment.yaml b/qa/suites/fs/recovery/tasks/fragment.yaml
deleted file mode 100644
index 482caad8515..00000000000
--- a/qa/suites/fs/recovery/tasks/fragment.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_fragment
diff --git a/qa/suites/fs/recovery/tasks/journal-repair.yaml b/qa/suites/fs/recovery/tasks/journal-repair.yaml
deleted file mode 100644
index 324ff75dfe9..00000000000
--- a/qa/suites/fs/recovery/tasks/journal-repair.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - bad backtrace on dir ino
-      - error reading table object
-      - Metadata damage detected
-      - slow requests are blocked
-      - Behind on trimming
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_journal_repair
diff --git a/qa/suites/fs/recovery/tasks/libcephfs_java.yaml b/qa/suites/fs/recovery/tasks/libcephfs_java.yaml
deleted file mode 100644
index aaffa033811..00000000000
--- a/qa/suites/fs/recovery/tasks/libcephfs_java.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-os_type: ubuntu
-os_version: "14.04"
-
-overrides:
-  ceph-fuse:
-    disabled: true
-  kclient:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs-java/test.sh
diff --git a/qa/suites/fs/recovery/tasks/libcephfs_python.yaml b/qa/suites/fs/recovery/tasks/libcephfs_python.yaml
deleted file mode 100644
index e5cbb14ba62..00000000000
--- a/qa/suites/fs/recovery/tasks/libcephfs_python.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true
-  kclient:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - fs/test_python.sh
diff --git a/qa/suites/fs/recovery/tasks/mds-flush.yaml b/qa/suites/fs/recovery/tasks/mds-flush.yaml
deleted file mode 100644
index d59a8ad5fc9..00000000000
--- a/qa/suites/fs/recovery/tasks/mds-flush.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_flush
diff --git a/qa/suites/fs/recovery/tasks/mds-full.yaml b/qa/suites/fs/recovery/tasks/mds-full.yaml
deleted file mode 100644
index 6865d83e807..00000000000
--- a/qa/suites/fs/recovery/tasks/mds-full.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-overrides:
-  ceph:
-    log-whitelist:
-      - OSD full dropping all updates
-      - OSD near full
-      - failsafe engaged, dropping updates
-      - failsafe disengaged, no longer dropping
-      - is full \(reached quota
-    conf:
-      osd:
-        osd mon report interval max: 5
-        osd objectstore: memstore
-        memstore device bytes: 100000000
-      client.0:
-        debug client: 20
-        debug objecter: 20
-        debug objectcacher: 20
-      client.1:
-        debug client: 20
-        debug objecter: 20
-        debug objectcacher: 20
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_full
diff --git a/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml b/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml
deleted file mode 100644
index fd23aa8bad0..00000000000
--- a/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
--mds_creation_failure:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]
-
diff --git a/qa/suites/fs/recovery/tasks/pool-perm.yaml b/qa/suites/fs/recovery/tasks/pool-perm.yaml
deleted file mode 100644
index f220626df62..00000000000
--- a/qa/suites/fs/recovery/tasks/pool-perm.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_pool_perm
diff --git a/qa/suites/fs/recovery/tasks/quota.yaml b/qa/suites/fs/recovery/tasks/quota.yaml
deleted file mode 100644
index 89b10ce2ede..00000000000
--- a/qa/suites/fs/recovery/tasks/quota.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_quota
diff --git a/qa/suites/fs/recovery/tasks/sessionmap.yaml b/qa/suites/fs/recovery/tasks/sessionmap.yaml
deleted file mode 100644
index 054fdb70792..00000000000
--- a/qa/suites/fs/recovery/tasks/sessionmap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-    log-whitelist:
-      - client session with invalid root
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/fs/recovery/tasks/strays.yaml b/qa/suites/fs/recovery/tasks/strays.yaml
deleted file mode 100644
index 2809fc141bf..00000000000
--- a/qa/suites/fs/recovery/tasks/strays.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_strays
diff --git a/qa/suites/fs/recovery/tasks/volume-client.yaml b/qa/suites/fs/recovery/tasks/volume-client.yaml
deleted file mode 100644
index e8c850a05cd..00000000000
--- a/qa/suites/fs/recovery/tasks/volume-client.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_volume_client