Merge remote-tracking branch 'origin/wip-10390' into greg-testing-quotas

Conflicts:
	suites/fs/recovery/tasks/mds-full.yaml

diff --cc suites/fs/recovery/tasks/client-limits.yaml
index 4cf874d5df836ca5011ded1f69129bca4263236f,3bb6d0246fa233da5e7f9111867ac0feac1a52aa..d4016f51d7295690ffbea95c770eb930abb80877
--- 1/suites/fs/recovery/tasks/client-limits.yaml
--- 2/suites/fs/recovery/tasks/client-limits.yaml
+++ b/suites/fs/recovery/tasks/client-limits.yaml
@@@ -1,8 -1,5 +1,10 @@@
  
 +overrides:
 +  ceph:
 +    log-whitelist:
 +      - responding to mclientcaps\(revoke\)
 +
  tasks:
- - mds_client_limits:
+   - cephfs_test_runner:
+       modules:
+         - tasks.cephfs.test_client_limits

diff --cc suites/fs/recovery/tasks/mds-full.yaml
index fe52ae32043ac5eff177457df9e6642d77625754,86d1d44022bb299ae53fb2029ad39444ddd60222..b9c46a1641c9b337a38a2397f99a8cf12e6dfa9f
--- 1/suites/fs/recovery/tasks/mds-full.yaml
--- 2/suites/fs/recovery/tasks/mds-full.yaml
+++ b/suites/fs/recovery/tasks/mds-full.yaml
@@@ -1,13 -1,12 +1,15 @@@
  
  overrides:
-     ceph:
-         log-whitelist:
-           - OSD full dropping all updates
-           - OSD near full
-         conf:
-             osd:
-               osd objectstore: memstore
-               memstore device bytes: 100000000
+   ceph:
++    log-whitelist:
++      - OSD full dropping all updates
++      - OSD near full
+     conf:
+       osd:
+         osd objectstore: memstore
+         memstore device bytes: 100000000
  
  tasks:
-     - mds_full:
+   - cephfs_test_runner:
+       modules:
+         - tasks.cephfs.test_full