From 78e3feaae39cf9a7b6a8f8c86129655b0c8a7d20 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 6 Aug 2016 21:10:19 -0400 Subject: [PATCH] suites/fs: unify/reuse common (fuse) mount Goal is to reduce arbitrary differences between fs suites. Signed-off-by: Patrick Donnelly --- cephfs/mount/fuse.yaml | 2 ++ suites/fs/32bits/mount/fuse.yaml | 1 + .../{mount/ceph-fuse.yaml => overrides/faked-ino.yaml} | 2 -- suites/fs/basic/mount/fuse.yaml | 1 + suites/fs/basic/tasks/asok_dump_tree.yaml | 1 - suites/fs/basic/tasks/cephfs_scrub_tests.yaml | 1 - .../basic/tasks/cfuse_workunit_kernel_untar_build.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_misc.yaml | 1 - .../basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_norstats.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_quota.yaml | 1 - .../basic/tasks/cfuse_workunit_suites_blogbench.yaml | 1 - .../fs/basic/tasks/cfuse_workunit_suites_dbench.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml | 1 - .../fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml | 1 - .../fs/basic/tasks/cfuse_workunit_suites_iozone.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml | 1 - .../tasks/cfuse_workunit_suites_truncate_delay.yaml | 1 - suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml | 1 - suites/fs/basic/tasks/libcephfs_interface_tests.yaml | 4 +++- suites/fs/basic/tasks/libcephfs_java.yaml | 4 +++- suites/fs/basic/tasks/libcephfs_python.yaml | 3 +++ suites/fs/basic/tasks/mds_creation_retry.yaml | 1 - suites/fs/multiclient/mount/ceph-fuse.yaml | 2 -- suites/fs/multiclient/mount/fuse.yaml | 1 + suites/fs/multifs/mount/fuse.yaml | 1 + suites/fs/multifs/mounts/ceph-fuse.yaml | 6 ------ suites/fs/multifs/tasks/failover.yaml | 4 +++- suites/fs/permission/mount/ceph-fuse.yaml | 8 -------- suites/fs/permission/mount/fuse.yaml | 1 + suites/fs/permission/tasks/cfuse_workunit_misc.yaml | 6 ++++++ .../fs/permission/tasks/cfuse_workunit_suites_pjd.yaml | 1 + suites/fs/recovery/mount/fuse.yaml | 1 + suites/fs/recovery/mounts/ceph-fuse.yaml | 10 ---------- suites/fs/recovery/overrides/fuse-unmounted.yaml | 3 +++ suites/fs/snaps/mount/ceph-fuse.yaml | 2 -- suites/fs/snaps/mount/fuse.yaml | 1 + suites/fs/standbyreplay/mount/fuse.yaml | 3 +-- suites/fs/thrash/mount/fuse.yaml | 1 + suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml | 1 - .../thrash/tasks/cfuse_workunit_suites_fsstress.yaml | 1 - suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml | 1 - .../fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml | 1 - suites/fs/traceless/mount/fuse.yaml | 1 + .../tasks/cfuse_workunit_suites_blogbench.yaml | 1 - .../traceless/tasks/cfuse_workunit_suites_dbench.yaml | 1 - .../fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml | 1 - .../tasks/cfuse_workunit_suites_fsstress.yaml | 1 - suites/fs/verify/mount/fuse.yaml | 1 + .../fs/verify/tasks/cfuse_workunit_suites_dbench.yaml | 1 - .../verify/tasks/cfuse_workunit_suites_fsstress.yaml | 1 - suites/fs/verify/tasks/libcephfs_interface_tests.yaml | 1 - .../libcephfs/tasks/libcephfs_interface_tests.yaml | 3 +++ suites/multimds/libcephfs/tasks/libcephfs_java.yaml | 3 +++ 57 files changed, 41 insertions(+), 65 deletions(-) create mode 100644 cephfs/mount/fuse.yaml create mode 120000 suites/fs/32bits/mount/fuse.yaml rename suites/fs/32bits/{mount/ceph-fuse.yaml => overrides/faked-ino.yaml} (79%) create mode 120000 suites/fs/basic/mount/fuse.yaml delete mode 100644 suites/fs/multiclient/mount/ceph-fuse.yaml create mode 120000 suites/fs/multiclient/mount/fuse.yaml create mode 120000 suites/fs/multifs/mount/fuse.yaml delete mode 100644 suites/fs/multifs/mounts/ceph-fuse.yaml delete mode 100644 suites/fs/permission/mount/ceph-fuse.yaml create mode 120000 suites/fs/permission/mount/fuse.yaml create mode 120000 suites/fs/recovery/mount/fuse.yaml delete mode 100644 suites/fs/recovery/mounts/ceph-fuse.yaml create mode 100644 suites/fs/recovery/overrides/fuse-unmounted.yaml delete mode 100644 suites/fs/snaps/mount/ceph-fuse.yaml create mode 120000 suites/fs/snaps/mount/fuse.yaml mode change 100644 => 120000 suites/fs/standbyreplay/mount/fuse.yaml create mode 120000 suites/fs/thrash/mount/fuse.yaml create mode 120000 suites/fs/traceless/mount/fuse.yaml create mode 120000 suites/fs/verify/mount/fuse.yaml diff --git a/cephfs/mount/fuse.yaml b/cephfs/mount/fuse.yaml new file mode 100644 index 0000000000000..8338cc4933e06 --- /dev/null +++ b/cephfs/mount/fuse.yaml @@ -0,0 +1,2 @@ +tasks: + - ceph-fuse: diff --git a/suites/fs/32bits/mount/fuse.yaml b/suites/fs/32bits/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/32bits/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/32bits/mount/ceph-fuse.yaml b/suites/fs/32bits/overrides/faked-ino.yaml similarity index 79% rename from suites/fs/32bits/mount/ceph-fuse.yaml rename to suites/fs/32bits/overrides/faked-ino.yaml index 3b9d833f3c8a6..102df684d32fe 100644 --- a/suites/fs/32bits/mount/ceph-fuse.yaml +++ b/suites/fs/32bits/overrides/faked-ino.yaml @@ -3,5 +3,3 @@ overrides: conf: client: client use faked inos: true -tasks: -- ceph-fuse: diff --git a/suites/fs/basic/mount/fuse.yaml b/suites/fs/basic/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/basic/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/asok_dump_tree.yaml b/suites/fs/basic/tasks/asok_dump_tree.yaml index bb21a771e439a..7fa561470b61b 100644 --- a/suites/fs/basic/tasks/asok_dump_tree.yaml +++ b/suites/fs/basic/tasks/asok_dump_tree.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - cephfs_test_runner: modules: - tasks.cephfs.test_dump_tree diff --git a/suites/fs/basic/tasks/cephfs_scrub_tests.yaml b/suites/fs/basic/tasks/cephfs_scrub_tests.yaml index 693687d9533bf..f0c2891ae7f75 100644 --- a/suites/fs/basic/tasks/cephfs_scrub_tests.yaml +++ b/suites/fs/basic/tasks/cephfs_scrub_tests.yaml @@ -7,7 +7,6 @@ overrides: mds log max segments: 1 mds cache max size: 1000 tasks: -- ceph-fuse: - cephfs_test_runner: modules: - tasks.cephfs.test_scrub_checks diff --git a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml index fcc52912963a4..8dbc24a9febf1 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml @@ -4,7 +4,6 @@ overrides: client: fuse_default_permissions: 0 tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml index 6dfec976eecc2..5d54f3da0b409 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: timeout: 6h clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml index c9720a2fd488f..c9de5c386377f 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml b/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml index 6174fad29d67f..4833371df1bce 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: timeout: 6h clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_quota.yaml b/suites/fs/basic/tasks/cfuse_workunit_quota.yaml index a6d35ab8ecec6..7908bc88c4b2d 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_quota.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_quota.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: timeout: 6h clients: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml index 09898e16bda4e..4c1fcc11ed906 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml index ad96b4c5e7fcf..41b2bc8edaab2 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml index 8600816003499..4a2a627fe5d32 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml @@ -4,7 +4,6 @@ overrides: osd: filestore flush min: 0 tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml index 5908d951b2df0..ddb18fb791aa2 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml index 3c11ed74fc728..8b2b1ab5c1414 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml index c6043e209bd45..7efa1adb82da8 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml index 6989990e22aa7..8d4c27108b281 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml index 1e23f670e2894..9270f3c51e22b 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: [client.0] - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml index 85bb18d7fa7bd..7cb0b0f6e6bf2 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml @@ -10,7 +10,6 @@ overrides: debug ms: 1 debug mds: 20 tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml index 911026e13bbc2..b47b565691460 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml @@ -7,7 +7,6 @@ overrides: ms_inject_delay_max: 5 client_oc_max_dirty_age: 1 tasks: -- ceph-fuse: - exec: client.0: - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100 diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml index 9509650c76c03..36e7411b6385a 100644 --- a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml +++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: [fs/misc/trivial_sync.sh] diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml index 0b1d41fea5c44..d9a2f9cdc6d36 100644 --- a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml +++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml @@ -1,5 +1,7 @@ +overrides: + ceph-fuse: + disabled: true tasks: -- ceph-fuse: - workunit: clients: client.0: diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml index 1e8c32f2202cd..f2eb00bf1187b 100644 --- a/suites/fs/basic/tasks/libcephfs_java.yaml +++ b/suites/fs/basic/tasks/libcephfs_java.yaml @@ -2,8 +2,10 @@ os_type: ubuntu os_version: "14.04" +overrides: + ceph-fuse: + disabled: true tasks: -- ceph-fuse: - workunit: clients: client.0: diff --git a/suites/fs/basic/tasks/libcephfs_python.yaml b/suites/fs/basic/tasks/libcephfs_python.yaml index 6f773299a87eb..ffbbff81b4b16 100644 --- a/suites/fs/basic/tasks/libcephfs_python.yaml +++ b/suites/fs/basic/tasks/libcephfs_python.yaml @@ -1,3 +1,6 @@ +overrides: + ceph-fuse: + disabled: true tasks: - workunit: clients: diff --git a/suites/fs/basic/tasks/mds_creation_retry.yaml b/suites/fs/basic/tasks/mds_creation_retry.yaml index 76ceeafa8e772..fd23aa8bad0c3 100644 --- a/suites/fs/basic/tasks/mds_creation_retry.yaml +++ b/suites/fs/basic/tasks/mds_creation_retry.yaml @@ -1,6 +1,5 @@ tasks: -mds_creation_failure: --ceph-fuse: - workunit: clients: all: [fs/misc/trivial_sync.sh] diff --git a/suites/fs/multiclient/mount/ceph-fuse.yaml b/suites/fs/multiclient/mount/ceph-fuse.yaml deleted file mode 100644 index e3c34a1f60462..0000000000000 --- a/suites/fs/multiclient/mount/ceph-fuse.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph-fuse: diff --git a/suites/fs/multiclient/mount/fuse.yaml b/suites/fs/multiclient/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/multiclient/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/multifs/mount/fuse.yaml b/suites/fs/multifs/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/multifs/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/multifs/mounts/ceph-fuse.yaml b/suites/fs/multifs/mounts/ceph-fuse.yaml deleted file mode 100644 index b9d4788d15794..0000000000000 --- a/suites/fs/multifs/mounts/ceph-fuse.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph-fuse: - client.0: - mounted: false - client.1: - mounted: false diff --git a/suites/fs/multifs/tasks/failover.yaml b/suites/fs/multifs/tasks/failover.yaml index 8f3d5e1a9bf9c..d837d4b2687c3 100644 --- a/suites/fs/multifs/tasks/failover.yaml +++ b/suites/fs/multifs/tasks/failover.yaml @@ -1,4 +1,6 @@ - +overrides: + ceph-fuse: + disabled: true tasks: - cephfs_test_runner: modules: diff --git a/suites/fs/permission/mount/ceph-fuse.yaml b/suites/fs/permission/mount/ceph-fuse.yaml deleted file mode 100644 index 6015e3736f38b..0000000000000 --- a/suites/fs/permission/mount/ceph-fuse.yaml +++ /dev/null @@ -1,8 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse default permissions: false - client acl type: posix_acl -tasks: -- ceph-fuse: diff --git a/suites/fs/permission/mount/fuse.yaml b/suites/fs/permission/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/permission/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/permission/tasks/cfuse_workunit_misc.yaml b/suites/fs/permission/tasks/cfuse_workunit_misc.yaml index 5f3d560a9f89f..618498e6cdc5d 100644 --- a/suites/fs/permission/tasks/cfuse_workunit_misc.yaml +++ b/suites/fs/permission/tasks/cfuse_workunit_misc.yaml @@ -1,3 +1,9 @@ +overrides: + ceph: + conf: + client: + fuse default permissions: false + client acl type: posix_acl tasks: - workunit: clients: diff --git a/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml index a1e2ada19e995..2dd8ac77955ad 100644 --- a/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml +++ b/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml @@ -4,6 +4,7 @@ overrides: client: fuse set user groups: true fuse default permissions: false + client acl type: posix_acl tasks: - workunit: clients: diff --git a/suites/fs/recovery/mount/fuse.yaml b/suites/fs/recovery/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/recovery/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/recovery/mounts/ceph-fuse.yaml b/suites/fs/recovery/mounts/ceph-fuse.yaml deleted file mode 100644 index b38965de641da..0000000000000 --- a/suites/fs/recovery/mounts/ceph-fuse.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: -- ceph-fuse: - client.0: - mounted: false - client.1: - mounted: false - client.2: - mounted: false - client.3: - mounted: false diff --git a/suites/fs/recovery/overrides/fuse-unmounted.yaml b/suites/fs/recovery/overrides/fuse-unmounted.yaml new file mode 100644 index 0000000000000..02c8cf4d006a7 --- /dev/null +++ b/suites/fs/recovery/overrides/fuse-unmounted.yaml @@ -0,0 +1,3 @@ +overrides: + ceph-fuse: + disabled: true diff --git a/suites/fs/snaps/mount/ceph-fuse.yaml b/suites/fs/snaps/mount/ceph-fuse.yaml deleted file mode 100644 index e3c34a1f60462..0000000000000 --- a/suites/fs/snaps/mount/ceph-fuse.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph-fuse: diff --git a/suites/fs/snaps/mount/fuse.yaml b/suites/fs/snaps/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/snaps/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/standbyreplay/mount/fuse.yaml b/suites/fs/standbyreplay/mount/fuse.yaml deleted file mode 100644 index dd489e7b6d1e0..0000000000000 --- a/suites/fs/standbyreplay/mount/fuse.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: - - ceph_fuse: diff --git a/suites/fs/standbyreplay/mount/fuse.yaml b/suites/fs/standbyreplay/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/standbyreplay/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/thrash/mount/fuse.yaml b/suites/fs/thrash/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/thrash/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml b/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml index 7efe47da3d0a5..790c93c2b170e 100644 --- a/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml +++ b/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml index 5908d951b2df0..ddb18fb791aa2 100644 --- a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml index 4e45dcac0ac33..a1e2ada19e995 100644 --- a/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml +++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml @@ -5,7 +5,6 @@ overrides: fuse set user groups: true fuse default permissions: false tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml index 9509650c76c03..36e7411b6385a 100644 --- a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml +++ b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: [fs/misc/trivial_sync.sh] diff --git a/suites/fs/traceless/mount/fuse.yaml b/suites/fs/traceless/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/traceless/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml index 09898e16bda4e..4c1fcc11ed906 100644 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml index ad96b4c5e7fcf..41b2bc8edaab2 100644 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml index 8600816003499..4a2a627fe5d32 100644 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml @@ -4,7 +4,6 @@ overrides: osd: filestore flush min: 0 tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml index 5908d951b2df0..ddb18fb791aa2 100644 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/verify/mount/fuse.yaml b/suites/fs/verify/mount/fuse.yaml new file mode 120000 index 0000000000000..af9ee0ab7986f --- /dev/null +++ b/suites/fs/verify/mount/fuse.yaml @@ -0,0 +1 @@ +../../../../cephfs/mount/fuse.yaml \ No newline at end of file diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml index ad96b4c5e7fcf..41b2bc8edaab2 100644 --- a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml +++ b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml index 5908d951b2df0..ddb18fb791aa2 100644 --- a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml +++ b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: all: diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml index 0b1d41fea5c44..04ab2a4bcfc32 100644 --- a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml +++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml @@ -1,5 +1,4 @@ tasks: -- ceph-fuse: - workunit: clients: client.0: diff --git a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml index 0b1d41fea5c44..8c6659f93df56 100644 --- a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml +++ b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml @@ -1,3 +1,6 @@ +overrides: + ceph-fuse: + disabled: true tasks: - ceph-fuse: - workunit: diff --git a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml index 4330d50965e5c..4bb7acefe80f9 100644 --- a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml +++ b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml @@ -1,3 +1,6 @@ +overrides: + ceph-fuse: + disabled: true tasks: - ceph-fuse: - workunit: -- 2.39.5