From eef0d958ddd6b75f6a2bc07fb61f293e043f0d17 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 6 Aug 2016 23:52:58 -0400 Subject: [PATCH] suites/fs: link to common tasks Goal is to reduce arbitrary differences between fs suites. Signed-off-by: Patrick Donnelly --- cephfs/tasks/cfuse_workunit_suites_blogbench.yaml | 5 +++++ cephfs/tasks/cfuse_workunit_suites_dbench.yaml | 5 +++++ cephfs/tasks/cfuse_workunit_suites_ffsb.yaml | 10 ++++++++++ cephfs/tasks/cfuse_workunit_suites_fsstress.yaml | 5 +++++ cephfs/tasks/cfuse_workunit_trivial_sync.yaml | 4 ++++ cephfs/tasks/libcephfs_interface_tests.yaml | 8 ++++++++ .../32bits/tasks/cfuse_workunit_suites_fsstress.yaml | 6 +----- .../basic/tasks/cfuse_workunit_suites_blogbench.yaml | 6 +----- .../fs/basic/tasks/cfuse_workunit_suites_dbench.yaml | 6 +----- suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml | 11 +---------- .../basic/tasks/cfuse_workunit_suites_fsstress.yaml | 6 +----- .../fs/basic/tasks/cfuse_workunit_trivial_sync.yaml | 5 +---- suites/fs/basic/tasks/libcephfs_interface_tests.yaml | 9 +-------- .../thrash/tasks/cfuse_workunit_suites_fsstress.yaml | 6 +----- .../fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml | 5 +---- .../tasks/cfuse_workunit_suites_blogbench.yaml | 6 +----- .../traceless/tasks/cfuse_workunit_suites_dbench.yaml | 6 +----- .../traceless/tasks/cfuse_workunit_suites_ffsb.yaml | 11 +---------- .../tasks/cfuse_workunit_suites_fsstress.yaml | 6 +----- .../fs/verify/tasks/cfuse_workunit_suites_dbench.yaml | 6 +----- .../verify/tasks/cfuse_workunit_suites_fsstress.yaml | 6 +----- suites/fs/verify/tasks/libcephfs_interface_tests.yaml | 6 +----- 22 files changed, 53 insertions(+), 91 deletions(-) create mode 100644 cephfs/tasks/cfuse_workunit_suites_blogbench.yaml create mode 100644 cephfs/tasks/cfuse_workunit_suites_dbench.yaml create mode 100644 cephfs/tasks/cfuse_workunit_suites_ffsb.yaml create mode 100644 cephfs/tasks/cfuse_workunit_suites_fsstress.yaml create mode 100644 cephfs/tasks/cfuse_workunit_trivial_sync.yaml create mode 100644 cephfs/tasks/libcephfs_interface_tests.yaml mode change 100644 => 120000 suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml mode change 100644 => 120000 suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml mode change 100644 => 120000 suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml mode change 100644 => 120000 suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml mode change 100644 => 120000 suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml mode change 100644 => 120000 suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml mode change 100644 => 120000 suites/fs/basic/tasks/libcephfs_interface_tests.yaml mode change 100644 => 120000 suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml mode change 100644 => 120000 suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml mode change 100644 => 120000 suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml mode change 100644 => 120000 suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml mode change 100644 => 120000 suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml mode change 100644 => 120000 suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml mode change 100644 => 120000 suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml mode change 100644 => 120000 suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml mode change 100644 => 120000 suites/fs/verify/tasks/libcephfs_interface_tests.yaml diff --git a/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml b/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml new file mode 100644 index 00000000000..4c1fcc11ed9 --- /dev/null +++ b/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - suites/blogbench.sh diff --git a/cephfs/tasks/cfuse_workunit_suites_dbench.yaml b/cephfs/tasks/cfuse_workunit_suites_dbench.yaml new file mode 100644 index 00000000000..41b2bc8edaa --- /dev/null +++ b/cephfs/tasks/cfuse_workunit_suites_dbench.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - suites/dbench.sh diff --git a/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml b/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml new file mode 100644 index 00000000000..4a2a627fe5d --- /dev/null +++ b/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml @@ -0,0 +1,10 @@ +overrides: + ceph: + conf: + osd: + filestore flush min: 0 +tasks: +- workunit: + clients: + all: + - suites/ffsb.sh diff --git a/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml b/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 100644 index 00000000000..ddb18fb791a --- /dev/null +++ b/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - suites/fsstress.sh diff --git a/cephfs/tasks/cfuse_workunit_trivial_sync.yaml b/cephfs/tasks/cfuse_workunit_trivial_sync.yaml new file mode 100644 index 00000000000..36e7411b638 --- /dev/null +++ b/cephfs/tasks/cfuse_workunit_trivial_sync.yaml @@ -0,0 +1,4 @@ +tasks: +- workunit: + clients: + all: [fs/misc/trivial_sync.sh] diff --git a/cephfs/tasks/libcephfs_interface_tests.yaml b/cephfs/tasks/libcephfs_interface_tests.yaml new file mode 100644 index 00000000000..d9a2f9cdc6d --- /dev/null +++ b/cephfs/tasks/libcephfs_interface_tests.yaml @@ -0,0 +1,8 @@ +overrides: + ceph-fuse: + disabled: true +tasks: +- workunit: + clients: + client.0: + - libcephfs/test.sh diff --git a/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..dc3fd3031b2 --- /dev/null +++ b/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml deleted file mode 100644 index 4c1fcc11ed9..00000000000 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml new file mode 120000 index 00000000000..8f2e88a01ee --- /dev/null +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml deleted file mode 100644 index 41b2bc8edaa..00000000000 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml new file mode 120000 index 00000000000..87c056d1b5c --- /dev/null +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml deleted file mode 100644 index 4a2a627fe5d..00000000000 --- a/suites/fs/basic/tasks/cfuse_workunit_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/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml new file mode 120000 index 00000000000..3528badeda1 --- /dev/null +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..dc3fd3031b2 --- /dev/null +++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml deleted file mode 100644 index 36e7411b638..00000000000 --- a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml new file mode 120000 index 00000000000..55a4c85a1bc --- /dev/null +++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml deleted file mode 100644 index d9a2f9cdc6d..00000000000 --- a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml +++ /dev/null @@ -1,8 +0,0 @@ -overrides: - ceph-fuse: - disabled: true -tasks: -- workunit: - clients: - client.0: - - libcephfs/test.sh diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml new file mode 120000 index 00000000000..582815a106c --- /dev/null +++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/libcephfs_interface_tests.yaml \ No newline at end of file diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..dc3fd3031b2 --- /dev/null +++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml deleted file mode 100644 index 36e7411b638..00000000000 --- a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- workunit: - clients: - all: [fs/misc/trivial_sync.sh] diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml new file mode 120000 index 00000000000..55a4c85a1bc --- /dev/null +++ b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_trivial_sync.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 deleted file mode 100644 index 4c1fcc11ed9..00000000000 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml new file mode 120000 index 00000000000..8f2e88a01ee --- /dev/null +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml \ No newline at end of file diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml deleted file mode 100644 index 41b2bc8edaa..00000000000 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml new file mode 120000 index 00000000000..87c056d1b5c --- /dev/null +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml \ No newline at end of file diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml deleted file mode 100644 index 4a2a627fe5d..00000000000 --- a/suites/fs/traceless/tasks/cfuse_workunit_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/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml new file mode 120000 index 00000000000..3528badeda1 --- /dev/null +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml \ No newline at end of file diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..dc3fd3031b2 --- /dev/null +++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.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 deleted file mode 100644 index 41b2bc8edaa..00000000000 --- a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml new file mode 120000 index 00000000000..87c056d1b5c --- /dev/null +++ b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml \ No newline at end of file diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791a..00000000000 --- a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..dc3fd3031b2 --- /dev/null +++ b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml deleted file mode 100644 index 04ab2a4bcfc..00000000000 --- a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - client.0: - - libcephfs/test.sh diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml new file mode 120000 index 00000000000..582815a106c --- /dev/null +++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml @@ -0,0 +1 @@ +../../../../cephfs/tasks/libcephfs_interface_tests.yaml \ No newline at end of file -- 2.39.5