From a32462fe4d5a209a99af2c8609d4d75b8632d6cd Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 19 Dec 2020 18:25:26 -0800 Subject: [PATCH] qa: migrate multimds workloads to fs:workloads Signed-off-by: Patrick Donnelly Fixes: https://tracker.ceph.com/issues/48121 --- .../clusters/1a5s-mds-1c-client-3node.yaml | 10 ++++++++++ .../clusters/1a2s-mds-1c-client-3node.yaml | 1 - .../clusters/1a5s-mds-1c-client-3node.yaml | 1 + qa/suites/fs/workload/ranks/1.yaml | 0 qa/suites/fs/workload/ranks/3.yaml | 9 +++++++++ qa/suites/fs/workload/ranks/5.yaml | 9 +++++++++ qa/suites/fs/workload/tasks/% | 0 .../fs/workload/tasks/0-check-counter.yaml | 2 ++ .../fs/workload/tasks/workunit/fs/misc.yaml | 5 +++-- .../workload/tasks/workunit/fs/norstats.yaml | 5 +++-- .../tasks/workunit/kernel_untar_build.yaml | 5 +++-- .../tasks/workunit/suites/blogbench.yaml | 11 ++++++++++- .../workload/tasks/workunit/suites/dbench.yaml | 6 +++++- .../workload/tasks/workunit/suites/ffsb.yaml | 18 +++++++++++++++++- .../tasks/workunit/suites/fsstress.yaml | 7 ++++++- .../fs/workload/tasks/workunit/suites/fsx.yaml | 5 +++-- .../cfuse_workunit_kernel_untar_build.yaml | 10 ---------- .../basic/tasks/cfuse_workunit_misc.yaml | 6 ------ .../basic/tasks/cfuse_workunit_norstats.yaml | 11 ----------- .../tasks/cfuse_workunit_suites_blogbench.yaml | 1 - .../tasks/cfuse_workunit_suites_dbench.yaml | 1 - .../tasks/cfuse_workunit_suites_ffsb.yaml | 1 - .../tasks/cfuse_workunit_suites_fsstress.yaml | 1 - .../basic/tasks/cfuse_workunit_suites_fsx.yaml | 5 ----- .../basic/tasks/cfuse_workunit_suites_pjd.yaml | 11 ----------- 25 files changed, 81 insertions(+), 60 deletions(-) create mode 100644 qa/cephfs/clusters/1a5s-mds-1c-client-3node.yaml delete mode 120000 qa/suites/fs/workload/clusters/1a2s-mds-1c-client-3node.yaml create mode 120000 qa/suites/fs/workload/clusters/1a5s-mds-1c-client-3node.yaml create mode 100644 qa/suites/fs/workload/ranks/1.yaml create mode 100644 qa/suites/fs/workload/ranks/3.yaml create mode 100644 qa/suites/fs/workload/ranks/5.yaml create mode 100644 qa/suites/fs/workload/tasks/% create mode 100644 qa/suites/fs/workload/tasks/0-check-counter.yaml mode change 120000 => 100644 qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml mode change 120000 => 100644 qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml mode change 120000 => 100644 qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml mode change 120000 => 100644 qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml delete mode 100644 qa/suites/multimds/basic/tasks/cfuse_workunit_kernel_untar_build.yaml delete mode 100644 qa/suites/multimds/basic/tasks/cfuse_workunit_misc.yaml delete mode 100644 qa/suites/multimds/basic/tasks/cfuse_workunit_norstats.yaml delete mode 120000 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_blogbench.yaml delete mode 120000 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_dbench.yaml delete mode 120000 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_ffsb.yaml delete mode 120000 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsstress.yaml delete mode 100644 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_fsx.yaml delete mode 100644 qa/suites/multimds/basic/tasks/cfuse_workunit_suites_pjd.yaml 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 index 00000000000..ae723c1609b --- /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 index 5d4410c1730..00000000000 --- 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 index 00000000000..e8ff97a0a21 --- /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 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/workload/ranks/3.yaml b/qa/suites/fs/workload/ranks/3.yaml new file mode 100644 index 00000000000..9ed043c1484 --- /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 index 00000000000..ed89cef3a86 --- /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 index 00000000000..e69de29bb2d 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 index 00000000000..6339ddb7c75 --- /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 7c3f7bc6702..4a9d0b4c57f 100644 --- 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 016e339eefd..d48df547100 100644 --- 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 65245fca41f..602d3416263 100644 --- 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 index 8702f4f3dc5..00000000000 --- 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 index 00000000000..4c4bf2f9eab --- /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 index b0f876c3c39..00000000000 --- 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 index 00000000000..41b2bc8edaa --- /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 index 01e889b23eb..00000000000 --- 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 index 00000000000..56b50bd6a89 --- /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 index c2e859fffbc..00000000000 --- 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 index 00000000000..bae2202921f --- /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 b16cfb17d60..12d456cf448 100644 --- 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 index 8dbc24a9feb..00000000000 --- 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 index 58866a27118..00000000000 --- 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 index 3776131bd08..00000000000 --- 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 index 8702f4f3dc5..00000000000 --- 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 index b0f876c3c39..00000000000 --- 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 index 01e889b23eb..00000000000 --- 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 index c2e859fffbc..00000000000 --- 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 index 8b2b1ab5c14..00000000000 --- 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 index f7784383be2..00000000000 --- 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 -- 2.39.5