From 862b84c1e8f496be71666c35c11c665c5c259a43 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 20 Aug 2018 13:51:35 -0700 Subject: [PATCH] qa: use cephfs standard configs for kclient Specifically, qa/cephfs/begin.yaml. Fixes: http://tracker.ceph.com/issues/26967 Signed-off-by: Patrick Donnelly --- qa/suites/kcephfs/cephfs/begin.yaml | 1 + qa/suites/kcephfs/cephfs/inline/no.yaml | 3 --- qa/suites/kcephfs/cephfs/inline/yes.yaml | 2 -- qa/suites/kcephfs/mixed-clients/begin.yaml | 1 + .../tasks/kernel_cfuse_workunits_dbench_iozone.yaml | 2 -- .../kernel_cfuse_workunits_untarbuild_blogbench.yaml | 2 -- qa/suites/kcephfs/recovery/begin.yaml | 1 + qa/suites/kcephfs/recovery/mounts/kmounts.yaml | 2 -- qa/suites/kcephfs/thrash/begin.yaml | 1 + qa/suites/kcephfs/thrash/thrashers/default.yaml | 10 +++++----- qa/suites/kcephfs/thrash/thrashers/mds.yaml | 8 +++----- qa/suites/kcephfs/thrash/thrashers/mon.yaml | 3 +-- 12 files changed, 13 insertions(+), 23 deletions(-) create mode 120000 qa/suites/kcephfs/cephfs/begin.yaml create mode 120000 qa/suites/kcephfs/mixed-clients/begin.yaml create mode 120000 qa/suites/kcephfs/recovery/begin.yaml create mode 120000 qa/suites/kcephfs/thrash/begin.yaml diff --git a/qa/suites/kcephfs/cephfs/begin.yaml b/qa/suites/kcephfs/cephfs/begin.yaml new file mode 120000 index 0000000000000..311d404f7c276 --- /dev/null +++ b/qa/suites/kcephfs/cephfs/begin.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/cephfs/inline/no.yaml b/qa/suites/kcephfs/cephfs/inline/no.yaml index 2030acb90836c..e69de29bb2d1d 100644 --- a/qa/suites/kcephfs/cephfs/inline/no.yaml +++ b/qa/suites/kcephfs/cephfs/inline/no.yaml @@ -1,3 +0,0 @@ -tasks: -- install: -- ceph: diff --git a/qa/suites/kcephfs/cephfs/inline/yes.yaml b/qa/suites/kcephfs/cephfs/inline/yes.yaml index 6f79dd5d7cb79..da8677a5cdb3c 100644 --- a/qa/suites/kcephfs/cephfs/inline/yes.yaml +++ b/qa/suites/kcephfs/cephfs/inline/yes.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - exec: client.0: - sudo ceph fs set cephfs inline_data true --yes-i-really-mean-it diff --git a/qa/suites/kcephfs/mixed-clients/begin.yaml b/qa/suites/kcephfs/mixed-clients/begin.yaml new file mode 120000 index 0000000000000..311d404f7c276 --- /dev/null +++ b/qa/suites/kcephfs/mixed-clients/begin.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml index 0121a01c53835..78b2d7611e5b4 100644 --- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml +++ b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - parallel: - user-workload - kclient-workload diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml index 7b0ce5b5d589d..d637ff989df17 100644 --- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml +++ b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - parallel: - user-workload - kclient-workload diff --git a/qa/suites/kcephfs/recovery/begin.yaml b/qa/suites/kcephfs/recovery/begin.yaml new file mode 120000 index 0000000000000..311d404f7c276 --- /dev/null +++ b/qa/suites/kcephfs/recovery/begin.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml b/qa/suites/kcephfs/recovery/mounts/kmounts.yaml index c18db8f5ea61d..c9a1f5b6f2359 100644 --- a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml +++ b/qa/suites/kcephfs/recovery/mounts/kmounts.yaml @@ -1,4 +1,2 @@ tasks: -- install: -- ceph: - kclient: diff --git a/qa/suites/kcephfs/thrash/begin.yaml b/qa/suites/kcephfs/thrash/begin.yaml new file mode 120000 index 0000000000000..311d404f7c276 --- /dev/null +++ b/qa/suites/kcephfs/thrash/begin.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/thrash/thrashers/default.yaml b/qa/suites/kcephfs/thrash/thrashers/default.yaml index e628ba6da65a2..1829619bd07b2 100644 --- a/qa/suites/kcephfs/thrash/thrashers/default.yaml +++ b/qa/suites/kcephfs/thrash/thrashers/default.yaml @@ -1,7 +1,7 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - - but it is still running - - objects unfound and apparently lost + - but it is still running + - objects unfound and apparently lost +tasks: - thrashosds: diff --git a/qa/suites/kcephfs/thrash/thrashers/mds.yaml b/qa/suites/kcephfs/thrash/thrashers/mds.yaml index d5d1f4357b9e1..ce87575c706e3 100644 --- a/qa/suites/kcephfs/thrash/thrashers/mds.yaml +++ b/qa/suites/kcephfs/thrash/thrashers/mds.yaml @@ -1,9 +1,7 @@ -tasks: -- install: -- ceph: -- mds_thrash: - overrides: ceph: log-whitelist: - not responding, replacing + +tasks: +- mds_thrash: diff --git a/qa/suites/kcephfs/thrash/thrashers/mon.yaml b/qa/suites/kcephfs/thrash/thrashers/mon.yaml index aa876d7d4864a..d72a99cbc9266 100644 --- a/qa/suites/kcephfs/thrash/thrashers/mon.yaml +++ b/qa/suites/kcephfs/thrash/thrashers/mon.yaml @@ -2,9 +2,8 @@ overrides: ceph: log-whitelist: - \(MON_DOWN\) + tasks: -- install: -- ceph: - mon_thrash: revive_delay: 20 thrash_delay: 1