From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 29 Oct 2020 18:12:44 +0000 (-0700)
Subject: qa: merge fs:basic_functional and kcephfs:recovery
X-Git-Tag: v16.1.0~689^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73c8c900bc6e71f6ae7174709ad2ef4dc9b42982;p=ceph.git

qa: merge fs:basic_functional and kcephfs:recovery

These functional tests can be run with both clients.

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/basic_functional/tasks/acls-fuse-client.yaml b/qa/suites/fs/basic_functional/tasks/acls-fuse-client.yaml
deleted file mode 100644
index 5b38d351bd43..000000000000
--- a/qa/suites/fs/basic_functional/tasks/acls-fuse-client.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_acls
diff --git a/qa/suites/fs/basic_functional/tasks/auto-repair.yaml b/qa/suites/fs/basic_functional/tasks/auto-repair.yaml
deleted file mode 100644
index c401ffd1b321..000000000000
--- a/qa/suites/fs/basic_functional/tasks/auto-repair.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - force file system read-only
-      - bad backtrace
-      - MDS in read-only mode
-      - \(MDS_READ_ONLY\)
-
-
-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
deleted file mode 100644
index d740a5f6f754..000000000000
--- a/qa/suites/fs/basic_functional/tasks/backtrace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_backtrace
diff --git a/qa/suites/fs/basic_functional/tasks/client-limits.yaml b/qa/suites/fs/basic_functional/tasks/client-limits.yaml
deleted file mode 100644
index e1ea5c157f99..000000000000
--- a/qa/suites/fs/basic_functional/tasks/client-limits.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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
-      - MDS cache is too large
-      - \(MDS_CLIENT_OLDEST_TID\)
-      - \(MDS_CACHE_OVERSIZED\)
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_client_limits
diff --git a/qa/suites/fs/basic_functional/tasks/client-recovery.yaml b/qa/suites/fs/basic_functional/tasks/client-recovery.yaml
deleted file mode 100644
index cdbbb31ee3fe..000000000000
--- a/qa/suites/fs/basic_functional/tasks/client-recovery.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# The task interferes with the network, so we need
-# to permit OSDs to complain about that.
-overrides:
-  ceph:
-    log-ignorelist:
-      - evicting unresponsive client
-      - but it is still running
-      - slow request
-      - MDS_CLIENT_LATE_RELEASE
-      - t responding to mclientcaps
-
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_client_recovery
diff --git a/qa/suites/fs/basic_functional/tasks/damage.yaml b/qa/suites/fs/basic_functional/tasks/damage.yaml
deleted file mode 100644
index 16d56ee2f362..000000000000
--- a/qa/suites/fs/basic_functional/tasks/damage.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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
-      - MDS_READ_ONLY
-      - force file system read-only
-
-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
deleted file mode 100644
index c720d3d7f354..000000000000
--- a/qa/suites/fs/basic_functional/tasks/data-scan.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - bad backtrace
-      - object missing on disk
-      - error reading table object
-      - error reading sessionmap
-      - unmatched fragstat
-      - unmatched rstat
-      - was unreadable, recreating it now
-      - Scrub error on inode
-      - Metadata damage detected
-      - inconsistent rstat on inode
-      - Error recovering journal
-
-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
deleted file mode 100644
index 73090662f87a..000000000000
--- a/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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/journal-repair.yaml b/qa/suites/fs/basic_functional/tasks/journal-repair.yaml
deleted file mode 100644
index 71c06de0726e..000000000000
--- a/qa/suites/fs/basic_functional/tasks/journal-repair.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - bad backtrace on directory inode
-      - 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/mds-flush.yaml b/qa/suites/fs/basic_functional/tasks/mds-flush.yaml
deleted file mode 100644
index d59a8ad5fc94..000000000000
--- a/qa/suites/fs/basic_functional/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/basic_functional/tasks/mds-full.yaml b/qa/suites/fs/basic_functional/tasks/mds-full.yaml
deleted file mode 100644
index 9ddccf83703d..000000000000
--- a/qa/suites/fs/basic_functional/tasks/mds-full.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-overrides:
-  ceph:
-    cephfs_ec_profile:
-      - disabled
-    log-ignorelist:
-      - OSD full dropping all updates
-      - OSD near full
-      - pausewr flag
-      - failsafe engaged, dropping updates
-      - failsafe disengaged, no longer dropping
-      - is full \(reached quota
-      - POOL_FULL
-      - POOL_BACKFILLFULL
-    conf:
-      mon:
-        mon osd nearfull ratio: 0.6
-        mon osd backfillfull ratio: 0.6
-        mon osd full ratio: 0.7
-      osd:
-        osd mon report interval: 5
-        osd objectstore: memstore
-        osd failsafe full ratio: 1.0
-        memstore device bytes: 200000000
-      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/pool-perm.yaml b/qa/suites/fs/basic_functional/tasks/pool-perm.yaml
deleted file mode 100644
index f220626df62f..000000000000
--- a/qa/suites/fs/basic_functional/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/basic_functional/tasks/sessionmap/+ b/qa/suites/fs/basic_functional/tasks/sessionmap/+
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/.qa b/qa/suites/fs/basic_functional/tasks/sessionmap/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/fs/basic_functional/tasks/sessionmap/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml b/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml
deleted file mode 100644
index 900fb4ecd40d..000000000000
--- a/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - client session with non-allowable 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
deleted file mode 100644
index 2809fc141bfb..000000000000
--- a/qa/suites/fs/basic_functional/tasks/strays.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_strays
diff --git a/qa/suites/fs/functional/% b/qa/suites/fs/functional/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/functional/.qa b/qa/suites/fs/functional/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/functional/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/begin.yaml b/qa/suites/fs/functional/begin.yaml
new file mode 120000
index 000000000000..311d404f7c27
--- /dev/null
+++ b/qa/suites/fs/functional/begin.yaml
@@ -0,0 +1 @@
+.qa/cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/clusters/.qa b/qa/suites/fs/functional/clusters/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/functional/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml b/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml
new file mode 120000
index 000000000000..e5444ae22637
--- /dev/null
+++ b/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1-mds-4-client-coloc.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/conf b/qa/suites/fs/functional/conf
new file mode 120000
index 000000000000..16e8cc44b7d7
--- /dev/null
+++ b/qa/suites/fs/functional/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file
diff --git a/qa/suites/fs/functional/mount b/qa/suites/fs/functional/mount
new file mode 120000
index 000000000000..e3600f453f2f
--- /dev/null
+++ b/qa/suites/fs/functional/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/objectstore/.qa b/qa/suites/fs/functional/objectstore/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/functional/objectstore/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml b/qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml
new file mode 120000
index 000000000000..a59cf5175069
--- /dev/null
+++ b/qa/suites/fs/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/functional/objectstore/bluestore-ec-root.yaml b/qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml
new file mode 120000
index 000000000000..4edebd6829d3
--- /dev/null
+++ b/qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml
@@ -0,0 +1 @@
+.qa/cephfs/objectstore-ec/bluestore-ec-root.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/overrides/+ b/qa/suites/fs/functional/overrides/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/functional/overrides/.qa b/qa/suites/fs/functional/overrides/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/functional/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/overrides/frag_enable.yaml b/qa/suites/fs/functional/overrides/frag_enable.yaml
new file mode 120000
index 000000000000..34a39a368cf1
--- /dev/null
+++ b/qa/suites/fs/functional/overrides/frag_enable.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/overrides/no_client_pidfile.yaml b/qa/suites/fs/functional/overrides/no_client_pidfile.yaml
new file mode 120000
index 000000000000..8888f33274be
--- /dev/null
+++ b/qa/suites/fs/functional/overrides/no_client_pidfile.yaml
@@ -0,0 +1 @@
+.qa/overrides/no_client_pidfile.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/overrides/whitelist_health.yaml b/qa/suites/fs/functional/overrides/whitelist_health.yaml
new file mode 120000
index 000000000000..74f39a49b27e
--- /dev/null
+++ b/qa/suites/fs/functional/overrides/whitelist_health.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml
new file mode 120000
index 000000000000..b4528c0f8c09
--- /dev/null
+++ b/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/functional/supported-random-distros$ b/qa/suites/fs/functional/supported-random-distros$
new file mode 120000
index 000000000000..0862b4457b37
--- /dev/null
+++ b/qa/suites/fs/functional/supported-random-distros$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/fs/functional/tasks/.qa b/qa/suites/fs/functional/tasks/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/functional/tasks/acls.yaml b/qa/suites/fs/functional/tasks/acls.yaml
new file mode 100644
index 000000000000..5b38d351bd43
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/acls.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_acls
diff --git a/qa/suites/fs/functional/tasks/auto-repair.yaml b/qa/suites/fs/functional/tasks/auto-repair.yaml
new file mode 100644
index 000000000000..1a3ff3efbc65
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/auto-repair.yaml
@@ -0,0 +1,11 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - force file system read-only
+      - bad backtrace
+      - MDS in read-only mode
+      - \(MDS_READ_ONLY\)
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_auto_repair
diff --git a/qa/suites/fs/functional/tasks/backtrace.yaml b/qa/suites/fs/functional/tasks/backtrace.yaml
new file mode 100644
index 000000000000..6d80c32cce98
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/backtrace.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_backtrace
diff --git a/qa/suites/fs/functional/tasks/client-limits.yaml b/qa/suites/fs/functional/tasks/client-limits.yaml
new file mode 100644
index 000000000000..4055f15acaa5
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/client-limits.yaml
@@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - 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
+      - MDS cache is too large
+      - \(MDS_CLIENT_OLDEST_TID\)
+      - \(MDS_CACHE_OVERSIZED\)
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_client_limits
diff --git a/qa/suites/fs/functional/tasks/client-recovery.yaml b/qa/suites/fs/functional/tasks/client-recovery.yaml
new file mode 100644
index 000000000000..d927fd11b6c7
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/client-recovery.yaml
@@ -0,0 +1,15 @@
+# The task interferes with the network, so we need
+# to permit OSDs to complain about that.
+overrides:
+  ceph:
+    log-ignorelist:
+      - evicting unresponsive client
+      - but it is still running
+      - slow request
+      - MDS_CLIENT_LATE_RELEASE
+      - t responding to mclientcaps
+tasks:
+  - cephfs_test_runner:
+      fail_on_skip: false
+      modules:
+        - tasks.cephfs.test_client_recovery
diff --git a/qa/suites/fs/functional/tasks/damage.yaml b/qa/suites/fs/functional/tasks/damage.yaml
new file mode 100644
index 000000000000..917c4b1a3d63
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/damage.yaml
@@ -0,0 +1,25 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - 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
+      - MDS_READ_ONLY
+      - force file system read-only
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_damage
+
diff --git a/qa/suites/fs/functional/tasks/data-scan.yaml b/qa/suites/fs/functional/tasks/data-scan.yaml
new file mode 100644
index 000000000000..b704a0036499
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/data-scan.yaml
@@ -0,0 +1,18 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - bad backtrace
+      - object missing on disk
+      - error reading table object
+      - error reading sessionmap
+      - unmatched fragstat
+      - unmatched rstat
+      - was unreadable, recreating it now
+      - Scrub error on inode
+      - Metadata damage detected
+      - inconsistent rstat on inode
+      - Error recovering journal
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_data_scan
diff --git a/qa/suites/fs/functional/tasks/forward-scrub.yaml b/qa/suites/fs/functional/tasks/forward-scrub.yaml
new file mode 100644
index 000000000000..f444455f1fef
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/forward-scrub.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - 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/functional/tasks/journal-repair.yaml b/qa/suites/fs/functional/tasks/journal-repair.yaml
new file mode 100644
index 000000000000..d6f87f871baf
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/journal-repair.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - bad backtrace on directory inode
+      - 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/functional/tasks/mds-flush.yaml b/qa/suites/fs/functional/tasks/mds-flush.yaml
new file mode 100644
index 000000000000..be8c4bee65b9
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/mds-flush.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_flush
diff --git a/qa/suites/fs/functional/tasks/mds-full.yaml b/qa/suites/fs/functional/tasks/mds-full.yaml
new file mode 100644
index 000000000000..d00dd9bbcc92
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/mds-full.yaml
@@ -0,0 +1,35 @@
+overrides:
+  ceph:
+    cephfs_ec_profile:
+      - disabled
+    log-ignorelist:
+      - OSD full dropping all updates
+      - OSD near full
+      - pausewr flag
+      - failsafe engaged, dropping updates
+      - failsafe disengaged, no longer dropping
+      - is full \(reached quota
+      - POOL_FULL
+      - POOL_BACKFILLFULL
+    conf:
+      mon:
+        mon osd nearfull ratio: 0.6
+        mon osd backfillfull ratio: 0.6
+        mon osd full ratio: 0.7
+      osd:
+        osd mon report interval: 5
+        osd objectstore: memstore
+        osd failsafe full ratio: 1.0
+        memstore device bytes: 200000000
+      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/functional/tasks/pool-perm.yaml b/qa/suites/fs/functional/tasks/pool-perm.yaml
new file mode 100644
index 000000000000..41392fe51a4d
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/pool-perm.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_pool_perm
diff --git a/qa/suites/fs/functional/tasks/sessionmap.yaml b/qa/suites/fs/functional/tasks/sessionmap.yaml
new file mode 100644
index 000000000000..3f66f32ab81f
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/sessionmap.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - client session with non-allowable root
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/fs/functional/tasks/strays.yaml b/qa/suites/fs/functional/tasks/strays.yaml
new file mode 100644
index 000000000000..3866ce510f3d
--- /dev/null
+++ b/qa/suites/fs/functional/tasks/strays.yaml
@@ -0,0 +1,4 @@
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_strays
diff --git a/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml b/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml
deleted file mode 100644
index 6e2701042470..000000000000
--- a/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_acls
diff --git a/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml b/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml
deleted file mode 100644
index c401ffd1b321..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - force file system read-only
-      - bad backtrace
-      - MDS in read-only mode
-      - \(MDS_READ_ONLY\)
-
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_auto_repair
diff --git a/qa/suites/kcephfs/recovery/tasks/backtrace.yaml b/qa/suites/kcephfs/recovery/tasks/backtrace.yaml
deleted file mode 100644
index d740a5f6f754..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/backtrace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_backtrace
diff --git a/qa/suites/kcephfs/recovery/tasks/client-limits.yaml b/qa/suites/kcephfs/recovery/tasks/client-limits.yaml
deleted file mode 100644
index 9bbe92f2ab42..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/client-limits.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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
-      - MDS cache is too large
-      - \(MDS_CLIENT_OLDEST_TID\)
-      - \(MDS_CACHE_OVERSIZED\)
-
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_client_limits
diff --git a/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml b/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml
deleted file mode 100644
index 27f1a2352294..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# The task interferes with the network, so we need
-# to permit OSDs to complain about that.
-overrides:
-  ceph:
-    log-ignorelist:
-      - but it is still running
-      - slow request
-      - evicting unresponsive client
-
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_client_recovery
diff --git a/qa/suites/kcephfs/recovery/tasks/damage.yaml b/qa/suites/kcephfs/recovery/tasks/damage.yaml
deleted file mode 100644
index 16d56ee2f362..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/damage.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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
-      - MDS_READ_ONLY
-      - force file system read-only
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_damage
-
diff --git a/qa/suites/kcephfs/recovery/tasks/data-scan.yaml b/qa/suites/kcephfs/recovery/tasks/data-scan.yaml
deleted file mode 100644
index 016faea125a4..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/data-scan.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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
-      - inconsistent rstat on inode
-      - Error recovering journal
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_data_scan
diff --git a/qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml b/qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml
deleted file mode 100644
index 73090662f87a..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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/kcephfs/recovery/tasks/journal-repair.yaml b/qa/suites/kcephfs/recovery/tasks/journal-repair.yaml
deleted file mode 100644
index 71c06de0726e..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/journal-repair.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-overrides:
-  ceph:
-    log-ignorelist:
-      - bad backtrace on directory inode
-      - 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/kcephfs/recovery/tasks/mds-flush.yaml b/qa/suites/kcephfs/recovery/tasks/mds-flush.yaml
deleted file mode 100644
index d59a8ad5fc94..000000000000
--- a/qa/suites/kcephfs/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/kcephfs/recovery/tasks/mds-full.yaml b/qa/suites/kcephfs/recovery/tasks/mds-full.yaml
deleted file mode 100644
index c1d24db5cccc..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/mds-full.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-overrides:
-  ceph:
-    cephfs_ec_profile:
-      - disabled
-    log-ignorelist:
-      - OSD full dropping all updates
-      - OSD near full
-      - pausewr flag
-      - failsafe engaged, dropping updates
-      - failsafe disengaged, no longer dropping
-      - is full \(reached quota
-      - POOL_FULL
-      - POOL_BACKFILLFULL
-    conf:
-      mon:
-        mon osd nearfull ratio: 0.6
-        mon osd backfillfull ratio: 0.6
-        mon osd full ratio: 0.7
-      osd:
-        osd mon report interval: 5
-        osd objectstore: memstore
-        osd failsafe full ratio: 1.0
-        memstore device bytes: 200000000
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_full
diff --git a/qa/suites/kcephfs/recovery/tasks/pool-perm.yaml b/qa/suites/kcephfs/recovery/tasks/pool-perm.yaml
deleted file mode 100644
index f220626df62f..000000000000
--- a/qa/suites/kcephfs/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/kcephfs/recovery/tasks/sessionmap.yaml b/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml
deleted file mode 100644
index d0be7b75dbcf..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - client session with non-allowable root
-
-tasks:
-  - cephfs_test_runner:
-      fail_on_skip: false
-      modules:
-        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/kcephfs/recovery/tasks/strays.yaml b/qa/suites/kcephfs/recovery/tasks/strays.yaml
deleted file mode 100644
index 2809fc141bfb..000000000000
--- a/qa/suites/kcephfs/recovery/tasks/strays.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_strays