suites/multimds: sync with fs suites

This commit synchronizes the multimds suite with the fs suite. The
basic/verify sub-suites now do the same tests except with different
cluster layouts (i.e. multiple actives). This is mostly accomplished by
symlinking parts of each sub-suite to its counterpart in the fs suite.

This commit also does a few things of note to the prior multimds suite:

o Turn on directory fragmentation.
o Add several tests from fs/basic/tasks to multimds/basic.
o Remove libcephfs as fs/basic/tasks already contain
  multimds/basic/tasks.

Prior implementation and discussion are in PR#1114: https://github.com/ceph/ceph-qa-suite/pull/1114

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/cephfs/clusters/3-mds.yaml b/cephfs/clusters/3-mds.yaml
new file mode 100644 (file)
index 0000000..c655b90
--- /dev/null
+++ b/cephfs/clusters/3-mds.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
+- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5]
+- [client.0]

diff --git a/cephfs/clusters/9-mds.yaml b/cephfs/clusters/9-mds.yaml
new file mode 100644 (file)
index 0000000..ed554c9
--- /dev/null
+++ b/cephfs/clusters/9-mds.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
+- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
+- [client.0]

diff --git a/cephfs/mount/kclient.yaml b/cephfs/mount/kclient.yaml
new file mode 100644 (file)
index 0000000..f00f16a
--- /dev/null
+++ b/cephfs/mount/kclient.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms die on skipped message: false
+tasks:
+- kclient:

diff --git a/cephfs/overrides/fuse/default-perm/% b/cephfs/overrides/fuse/default-perm/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/cephfs/overrides/fuse/default-perm/no.yaml b/cephfs/overrides/fuse/default-perm/no.yaml
new file mode 100644 (file)
index 0000000..445e936
--- /dev/null
+++ b/cephfs/overrides/fuse/default-perm/no.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        fuse default permissions: false

diff --git a/cephfs/overrides/fuse/default-perm/yes.yaml b/cephfs/overrides/fuse/default-perm/yes.yaml
new file mode 100644 (file)
index 0000000..2fd210a
--- /dev/null
+++ b/cephfs/overrides/fuse/default-perm/yes.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        fuse default permissions: true

diff --git a/suites/multimds/basic/begin.yaml b/suites/multimds/basic/begin.yaml
new file mode 120000 (symlink)
index 0000000..61b6545
--- /dev/null
+++ b/suites/multimds/basic/begin.yaml
@@ -0,0 +1 @@
+../../fs/basic/begin.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/ceph/base.yaml b/suites/multimds/basic/ceph/base.yaml
deleted file mode 100644 (file)
index 50b60b5..0000000
--- a/suites/multimds/basic/ceph/base.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0

diff --git a/suites/multimds/basic/clusters/3-mds.yaml b/suites/multimds/basic/clusters/3-mds.yaml
deleted file mode 100644 (file)
index c655b90c81cdbebbfb34b85129f3f94f3bfe7d0b..0000000000000000000000000000000000000000
--- a/suites/multimds/basic/clusters/3-mds.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5]
-- [client.0]

diff --git a/suites/multimds/basic/clusters/3-mds.yaml b/suites/multimds/basic/clusters/3-mds.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..97d5edc60119d494a15f26fd6b2c5176eee0eadf
--- /dev/null
+++ b/suites/multimds/basic/clusters/3-mds.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/3-mds.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/clusters/9-mds.yaml b/suites/multimds/basic/clusters/9-mds.yaml
deleted file mode 100644 (file)
index ed554c9fe3c7eef1001b702a41558aaa705784f2..0000000000000000000000000000000000000000
--- a/suites/multimds/basic/clusters/9-mds.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5]
-- [client.0]

diff --git a/suites/multimds/basic/clusters/9-mds.yaml b/suites/multimds/basic/clusters/9-mds.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..c5222943220a26d601093911669c9853154f2647
--- /dev/null
+++ b/suites/multimds/basic/clusters/9-mds.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/9-mds.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/debug/mds_client.yaml b/suites/multimds/basic/debug/mds_client.yaml
deleted file mode 120000 (symlink)
index 335c1ca..0000000
--- a/suites/multimds/basic/debug/mds_client.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../debug/mds_client.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/fs b/suites/multimds/basic/fs
new file mode 120000 (symlink)
index 0000000..a7abfe4
--- /dev/null
+++ b/suites/multimds/basic/fs
@@ -0,0 +1 @@
+../../fs/basic/fs/
\ No newline at end of file

diff --git a/suites/multimds/basic/fs/xfs.yaml b/suites/multimds/basic/fs/xfs.yaml
deleted file mode 120000 (symlink)
index 4c28d73..0000000
--- a/suites/multimds/basic/fs/xfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../fs/xfs.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/inline b/suites/multimds/basic/inline
new file mode 120000 (symlink)
index 0000000..3b88069
--- /dev/null
+++ b/suites/multimds/basic/inline
@@ -0,0 +1 @@
+../../fs/basic/inline/
\ No newline at end of file

diff --git a/suites/multimds/basic/inline/no.yaml b/suites/multimds/basic/inline/no.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/multimds/basic/inline/yes.yaml b/suites/multimds/basic/inline/yes.yaml
deleted file mode 100644 (file)
index ae5222f..0000000
--- a/suites/multimds/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/suites/multimds/basic/mount/cfuse.yaml b/suites/multimds/basic/mount/cfuse.yaml
deleted file mode 100644 (file)
index e3c34a1..0000000
--- a/suites/multimds/basic/mount/cfuse.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph-fuse:

diff --git a/suites/multimds/basic/mount/fuse.yaml b/suites/multimds/basic/mount/fuse.yaml
new file mode 120000 (symlink)
index 0000000..af9ee0a
--- /dev/null
+++ b/suites/multimds/basic/mount/fuse.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/mount/kclient.yaml b/suites/multimds/basic/mount/kclient.yaml
deleted file mode 100644 (file)
index f00f16aea2250dfa291aa97d39d887ec522f482c..0000000000000000000000000000000000000000
--- a/suites/multimds/basic/mount/kclient.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms die on skipped message: false
-tasks:
-- kclient:

diff --git a/suites/multimds/basic/mount/kclient.yaml b/suites/multimds/basic/mount/kclient.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..b6f2aad4a0fa9244e8b2857ef8fc988d1907b118
--- /dev/null
+++ b/suites/multimds/basic/mount/kclient.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/kclient.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/overrides/% b/suites/multimds/basic/overrides/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/multimds/basic/overrides/basic b/suites/multimds/basic/overrides/basic
new file mode 120000 (symlink)
index 0000000..1ccfd0e
--- /dev/null
+++ b/suites/multimds/basic/overrides/basic
@@ -0,0 +1 @@
+../../../fs/basic/overrides/
\ No newline at end of file

diff --git a/suites/multimds/basic/overrides/fuse-default-perm-no.yaml b/suites/multimds/basic/overrides/fuse-default-perm-no.yaml
new file mode 120000 (symlink)
index 0000000..1bada5b
--- /dev/null
+++ b/suites/multimds/basic/overrides/fuse-default-perm-no.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/fuse/default-perm/no.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000 (symlink)
index 08f746b..0000000
--- a/suites/multimds/basic/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file

diff --git a/suites/multimds/basic/tasks b/suites/multimds/basic/tasks
new file mode 120000 (symlink)
index 0000000..c65dcf4
--- /dev/null
+++ b/suites/multimds/basic/tasks
@@ -0,0 +1 @@
+../../fs/basic/tasks/
\ No newline at end of file

diff --git a/suites/multimds/basic/tasks/kernel_untar_build.yaml b/suites/multimds/basic/tasks/kernel_untar_build.yaml
deleted file mode 100644 (file)
index 8dbc24a..0000000
--- a/suites/multimds/basic/tasks/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/suites/multimds/basic/tasks/misc.yaml b/suites/multimds/basic/tasks/misc.yaml
deleted file mode 100644 (file)
index 6c8327b..0000000
--- a/suites/multimds/basic/tasks/misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    timeout: 5h
-    clients:
-      all:
-        - fs/misc

diff --git a/suites/multimds/basic/tasks/misc_test_o_trunc.yaml b/suites/multimds/basic/tasks/misc_test_o_trunc.yaml
deleted file mode 100644 (file)
index c9de5c3..0000000
--- a/suites/multimds/basic/tasks/misc_test_o_trunc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/test_o_trunc.sh

diff --git a/suites/multimds/basic/tasks/suites_blogbench.yaml b/suites/multimds/basic/tasks/suites_blogbench.yaml
deleted file mode 100644 (file)
index 4c1fcc1..0000000
--- a/suites/multimds/basic/tasks/suites_blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/blogbench.sh

diff --git a/suites/multimds/basic/tasks/suites_dbench.yaml b/suites/multimds/basic/tasks/suites_dbench.yaml
deleted file mode 100644 (file)
index 41b2bc8..0000000
--- a/suites/multimds/basic/tasks/suites_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/suites/multimds/basic/tasks/suites_ffsb.yaml b/suites/multimds/basic/tasks/suites_ffsb.yaml
deleted file mode 100644 (file)
index 4a2a627..0000000
--- a/suites/multimds/basic/tasks/suites_ffsb.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        filestore flush min: 0
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/ffsb.sh

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

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

diff --git a/suites/multimds/basic/tasks/suites_fsync.yaml b/suites/multimds/basic/tasks/suites_fsync.yaml
deleted file mode 100644 (file)
index 7efa1ad..0000000
--- a/suites/multimds/basic/tasks/suites_fsync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsync-tester.sh

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

diff --git a/suites/multimds/basic/tasks/suites_iozone.yaml b/suites/multimds/basic/tasks/suites_iozone.yaml
deleted file mode 100644 (file)
index 9270f3c..0000000
--- a/suites/multimds/basic/tasks/suites_iozone.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh

diff --git a/suites/multimds/basic/tasks/suites_pjd.yaml b/suites/multimds/basic/tasks/suites_pjd.yaml
deleted file mode 100644 (file)
index 7cb0b0f..0000000
--- a/suites/multimds/basic/tasks/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/suites/multimds/basic/tasks/suites_truncate_delay.yaml b/suites/multimds/basic/tasks/suites_truncate_delay.yaml
deleted file mode 100644 (file)
index ac5c9b1..0000000
--- a/suites/multimds/basic/tasks/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:
-      - dd if=/dev/zero of=./foo count=100
-      - sleep 2
-      - truncate --size 0 ./foo

diff --git a/suites/multimds/basic/tasks/trivial_sync.yaml b/suites/multimds/basic/tasks/trivial_sync.yaml
deleted file mode 100644 (file)
index 36e7411..0000000
--- a/suites/multimds/basic/tasks/trivial_sync.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]

diff --git a/suites/multimds/libcephfs/% b/suites/multimds/libcephfs/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/multimds/libcephfs/ceph/base.yaml b/suites/multimds/libcephfs/ceph/base.yaml
deleted file mode 100644 (file)
index 50b60b5..0000000
--- a/suites/multimds/libcephfs/ceph/base.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0

diff --git a/suites/multimds/libcephfs/clusters/3-mds.yaml b/suites/multimds/libcephfs/clusters/3-mds.yaml
deleted file mode 100644 (file)
index 1f46e7f..0000000
--- a/suites/multimds/libcephfs/clusters/3-mds.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5, client.0]
-

diff --git a/suites/multimds/libcephfs/clusters/9-mds.yaml b/suites/multimds/libcephfs/clusters/9-mds.yaml
deleted file mode 100644 (file)
index 252a63e..0000000
--- a/suites/multimds/libcephfs/clusters/9-mds.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, client.0]

diff --git a/suites/multimds/libcephfs/debug/mds_client.yaml b/suites/multimds/libcephfs/debug/mds_client.yaml
deleted file mode 120000 (symlink)
index 335c1ca..0000000
--- a/suites/multimds/libcephfs/debug/mds_client.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../debug/mds_client.yaml
\ No newline at end of file

diff --git a/suites/multimds/libcephfs/fs/xfs.yaml b/suites/multimds/libcephfs/fs/xfs.yaml
deleted file mode 120000 (symlink)
index 4c28d73..0000000
--- a/suites/multimds/libcephfs/fs/xfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../fs/xfs.yaml
\ No newline at end of file

diff --git a/suites/multimds/libcephfs/inline/no.yaml b/suites/multimds/libcephfs/inline/no.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/multimds/libcephfs/inline/yes.yaml b/suites/multimds/libcephfs/inline/yes.yaml
deleted file mode 100644 (file)
index ae5222f..0000000
--- a/suites/multimds/libcephfs/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/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000 (symlink)
index 08f746b..0000000
--- a/suites/multimds/libcephfs/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file

diff --git a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index 8c6659f..0000000
--- a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

diff --git a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
deleted file mode 100644 (file)
index 4bb7ace..0000000
--- a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs-java/test.sh

diff --git a/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml b/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml
deleted file mode 100644 (file)
index cd87f28..0000000
--- a/suites/multimds/libcephfs/tasks/mds_creation_retry.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
--mds_creation_failure:
--ceph-fuse:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]

diff --git a/suites/multimds/verify/begin.yaml b/suites/multimds/verify/begin.yaml
new file mode 120000 (symlink)
index 0000000..a199d46
--- /dev/null
+++ b/suites/multimds/verify/begin.yaml
@@ -0,0 +1 @@
+../../fs/verify/begin.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/ceph/base.yaml b/suites/multimds/verify/ceph/base.yaml
deleted file mode 100644 (file)
index 50b60b5..0000000
--- a/suites/multimds/verify/ceph/base.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-- ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0

diff --git a/suites/multimds/verify/clusters/3-mds.yaml b/suites/multimds/verify/clusters/3-mds.yaml
deleted file mode 100644 (file)
index 7ebdeba3649367938c7460e2e22142e41196a968..0000000000000000000000000000000000000000
--- a/suites/multimds/verify/clusters/3-mds.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2]
-- [mon.b, mds.b, mds.c, osd.3, osd.4, osd.5, client.0]

diff --git a/suites/multimds/verify/clusters/3-mds.yaml b/suites/multimds/verify/clusters/3-mds.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..97d5edc60119d494a15f26fd6b2c5176eee0eadf
--- /dev/null
+++ b/suites/multimds/verify/clusters/3-mds.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/3-mds.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/clusters/9-mds.yaml b/suites/multimds/verify/clusters/9-mds.yaml
deleted file mode 100644 (file)
index 252a63e49d18e78fe0fbacdd2ea2a22c4d19bb66..0000000000000000000000000000000000000000
--- a/suites/multimds/verify/clusters/9-mds.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2]
-- [mon.b, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5, client.0]

diff --git a/suites/multimds/verify/clusters/9-mds.yaml b/suites/multimds/verify/clusters/9-mds.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..c5222943220a26d601093911669c9853154f2647
--- /dev/null
+++ b/suites/multimds/verify/clusters/9-mds.yaml
@@ -0,0 +1 @@
+../../../../cephfs/clusters/9-mds.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/debug/mds_client.yaml b/suites/multimds/verify/debug/mds_client.yaml
deleted file mode 120000 (symlink)
index 335c1ca..0000000
--- a/suites/multimds/verify/debug/mds_client.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../debug/mds_client.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/fs b/suites/multimds/verify/fs
new file mode 120000 (symlink)
index 0000000..3d1f584
--- /dev/null
+++ b/suites/multimds/verify/fs
@@ -0,0 +1 @@
+../../fs/verify/fs/
\ No newline at end of file

diff --git a/suites/multimds/verify/fs/xfs.yaml b/suites/multimds/verify/fs/xfs.yaml
deleted file mode 120000 (symlink)
index 4c28d73..0000000
--- a/suites/multimds/verify/fs/xfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../fs/xfs.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/mount/fuse.yaml b/suites/multimds/verify/mount/fuse.yaml
new file mode 120000 (symlink)
index 0000000..af9ee0a
--- /dev/null
+++ b/suites/multimds/verify/mount/fuse.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/mount/kclient.yaml b/suites/multimds/verify/mount/kclient.yaml
new file mode 120000 (symlink)
index 0000000..b6f2aad
--- /dev/null
+++ b/suites/multimds/verify/mount/kclient.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/kclient.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/overrides/% b/suites/multimds/verify/overrides/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/multimds/verify/overrides/fuse-default-perm-no.yaml b/suites/multimds/verify/overrides/fuse-default-perm-no.yaml
new file mode 120000 (symlink)
index 0000000..1bada5b
--- /dev/null
+++ b/suites/multimds/verify/overrides/fuse-default-perm-no.yaml
@@ -0,0 +1 @@
+../../../../cephfs/overrides/fuse/default-perm/no.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/overrides/verify b/suites/multimds/verify/overrides/verify
new file mode 120000 (symlink)
index 0000000..3ded92e
--- /dev/null
+++ b/suites/multimds/verify/overrides/verify
@@ -0,0 +1 @@
+../../../fs/verify/overrides/
\ No newline at end of file

diff --git a/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml b/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000 (symlink)
index 08f746b..0000000
--- a/suites/multimds/verify/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file

diff --git a/suites/multimds/verify/tasks b/suites/multimds/verify/tasks
new file mode 120000 (symlink)
index 0000000..f0edfbd
--- /dev/null
+++ b/suites/multimds/verify/tasks
@@ -0,0 +1 @@
+../../fs/verify/tasks/
\ No newline at end of file

diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index ad96b4c..0000000
--- a/suites/multimds/verify/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 5908d95..0000000
--- a/suites/multimds/verify/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml b/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index 0b1d41f..0000000
--- a/suites/multimds/verify/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

diff --git a/suites/multimds/verify/validater b/suites/multimds/verify/validater
new file mode 120000 (symlink)
index 0000000..0c7f8a5
--- /dev/null
+++ b/suites/multimds/verify/validater
@@ -0,0 +1 @@
+../../fs/verify/validater/
\ No newline at end of file

diff --git a/suites/multimds/verify/validater/lockdep.yaml b/suites/multimds/verify/validater/lockdep.yaml
deleted file mode 100644 (file)
index 25f8435..0000000
--- a/suites/multimds/verify/validater/lockdep.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        lockdep: true

diff --git a/suites/multimds/verify/validater/valgrind.yaml b/suites/multimds/verify/validater/valgrind.yaml
deleted file mode 100644 (file)
index ba660c5..0000000
--- a/suites/multimds/verify/validater/valgrind.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-os_type: centos   # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126
-overrides:
-  install:
-    ceph:
-      flavor: notcmalloc
-      debuginfo: true
-  ceph:
-    conf:
-      global:
-        osd heartbeat grace: 40
-    valgrind:
-      mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
-      osd: [--tool=memcheck]
-      mds: [--tool=memcheck]
-  ceph-fuse:
-    client.0:
-      valgrind: [--tool=memcheck, --leak-check=full, --show-reachable=yes]