qa: migrate multimds workloads to fs:workloads

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

diff --git a/qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml b/qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml
new file mode 100644 (file)
index 0000000..ae723c1
--- /dev/null
+++ b/qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml
@@ -0,0 +1,10 @@
+roles:
+- [mon.a, mgr.x, mds.a, mds.d, osd.0, osd.3, osd.6, osd.9, client.0]
+- [mon.b, mgr.y, mds.b, mds.e, osd.1, osd.4, osd.7, osd.10]
+- [mon.c, mgr.z, mds.c, mds.f, osd.2, osd.5, osd.8, osd.11]
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 20 # GB
+- machine:
+    disk: 200 # GB

diff --git a/qa/suites/fs/workload/clusters/1a2s-mds-1c-client-3node.yaml b/qa/suites/fs/workload/clusters/1a2s-mds-1c-client-3node.yaml
deleted file mode 120000 (symlink)
index 5d4410c..0000000
--- a/qa/suites/fs/workload/clusters/1a2s-mds-1c-client-3node.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/1a2s-mds-1c-client-3node.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml b/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml
new file mode 120000 (symlink)
index 0000000..e8ff97a
--- /dev/null
+++ b/qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/ranks/1.yaml b/qa/suites/fs/workload/ranks/1.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/fs/workload/ranks/3.yaml b/qa/suites/fs/workload/ranks/3.yaml
new file mode 100644 (file)
index 0000000..9ed043c
--- /dev/null
+++ b/qa/suites/fs/workload/ranks/3.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    cephfs:
+      max_mds: 3
+  check-counter:
+    counters:
+      mds:
+        - mds.exported
+        - mds.imported

diff --git a/qa/suites/fs/workload/ranks/5.yaml b/qa/suites/fs/workload/ranks/5.yaml
new file mode 100644 (file)
index 0000000..ed89cef
--- /dev/null
+++ b/qa/suites/fs/workload/ranks/5.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    cephfs:
+      max_mds: 5
+  check-counter:
+    counters:
+      mds:
+        - mds.exported
+        - mds.imported

diff --git a/qa/suites/fs/workload/tasks/% b/qa/suites/fs/workload/tasks/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/fs/workload/tasks/0-check-counter.yaml b/qa/suites/fs/workload/tasks/0-check-counter.yaml
new file mode 100644 (file)
index 0000000..6339ddb
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/0-check-counter.yaml
@@ -0,0 +1,2 @@
+tasks:
+- check-counter: {}

diff --git a/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml b/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml
index 7c3f7bc6702395c99caa2b6b52d2dcb5b4ec607b..4a9d0b4c57f1309bac7d281ac2883fc2384b5c5c 100644 (file)
--- a/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml
+++ b/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml
@@ -1,8 +1,9 @@
-tasks:
-- check-counter:
+overrides:
+  check-counter:
     counters:
       mds:
         - "mds.dir_split"
+tasks:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml b/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
index 016e339eefd0853fba91ac1d1ea61ed96ef178b6..d48df547100a28f162dd2b1286a385bdc1041684 100644 (file)
--- a/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
+++ b/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
@@ -1,8 +1,9 @@
-tasks:
-- check-counter:
+overrides:
+  check-counter:
     counters:
       mds:
         - "mds.dir_split"
+tasks:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml b/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml
index 65245fca41f4a24d7630c35f35f994b798b30040..602d3416263fe85f8ade8afc36d833a3d8ab4c0f 100644 (file)
--- a/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml
+++ b/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml
@@ -1,8 +1,9 @@
-tasks:
-- check-counter:
+overrides:
+  check-counter:
     counters:
       mds:
         - "mds.dir_split"
+tasks:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml b/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
deleted file mode 120000 (symlink)
index 8702f4f3dc52b092b856d08c5bd2d1e1f9f0329e..0000000000000000000000000000000000000000
--- a/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml b/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..4c4bf2f9eabdda5291635d5d2c54e6a2f12d0411
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
@@ -0,0 +1,10 @@
+overrides:
+  check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/blogbench.sh

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml b/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
deleted file mode 120000 (symlink)
index b0f876c3c39b06af104969636688656db90e6368..0000000000000000000000000000000000000000
--- a/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml b/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..41b2bc8edaab2004345e56ae8e43057726720ad6
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/dbench.sh

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml b/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
deleted file mode 120000 (symlink)
index 01e889b23eb4983cdf0f25e1b9038ab5a3b08fd5..0000000000000000000000000000000000000000
--- a/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml b/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..56b50bd6a89c028d8baccb522b147d12afcceaaa
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
@@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    log-ignorelist:
+    - SLOW_OPS
+    - slow request
+    conf:
+      osd:
+        filestore flush min: 0
+  check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/ffsb.sh

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml b/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
deleted file mode 120000 (symlink)
index c2e859fffbc868af9aeb8986aa79297413f0c52a..0000000000000000000000000000000000000000
--- a/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml b/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..bae2202921ff5d9734fff5391a7a78fd1add5e6a
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - suites/fsstress.sh

diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml b/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml
index b16cfb17d60045e63e6aae52ddc58e3f8bfd6c83..12d456cf44842fafccdb38d331c3990bfc029a32 100644 (file)
--- a/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml
+++ b/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml
@@ -1,8 +1,9 @@
-tasks:
-- check-counter:
+overrides:
+  check-counter:
     counters:
       mds:
         - "mds.dir_split"
+tasks:
 - workunit:
     clients:
       all:

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 8dbc24a..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0
-tasks:
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644 (file)
index 58866a2..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/misc
-

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_norstats.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_norstats.yaml
deleted file mode 100644 (file)
index 3776131..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_norstats.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/norstats
-
-overrides:
-  ceph:
-    conf:
-      client:
-        client dirsize rbytes: false

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 120000 (symlink)
index 8702f4f..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 120000 (symlink)
index b0f876c..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 120000 (symlink)
index 01e889b..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 120000 (symlink)
index c2e859f..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 8b2b1ab..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsx.sh

diff --git a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index f778438..0000000
--- a/qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse set user groups: true
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - suites/pjd.sh