From 0635c25e74bfd3bd872088f6e5fcbfbb46b6d3e8 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 10 Jul 2017 16:54:24 +0200 Subject: [PATCH] qa/suites/krbd: reorganize thrash tests - factor out install and ceph into ceph/ceph.yaml - pg_num thrashing + 20 minute health timeout for thrashosds - common thrashosds-health.yaml whitelist - drop iozone workload Signed-off-by: Ilya Dryomov --- qa/suites/krbd/thrash/ceph/ceph.yaml | 3 +++ qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml | 2 -- .../krbd/thrash/thrashers/{default.yaml => pggrow.yaml} | 9 ++++++--- qa/suites/krbd/thrash/thrashosds-health.yaml | 1 + .../workloads/rbd_workunit_suites_iozone.yaml.disabled | 8 -------- 5 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 qa/suites/krbd/thrash/ceph/ceph.yaml rename qa/suites/krbd/thrash/thrashers/{default.yaml => pggrow.yaml} (56%) create mode 120000 qa/suites/krbd/thrash/thrashosds-health.yaml delete mode 100644 qa/suites/krbd/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled diff --git a/qa/suites/krbd/thrash/ceph/ceph.yaml b/qa/suites/krbd/thrash/ceph/ceph.yaml new file mode 100644 index 00000000000..2030acb9083 --- /dev/null +++ b/qa/suites/krbd/thrash/ceph/ceph.yaml @@ -0,0 +1,3 @@ +tasks: +- install: +- ceph: diff --git a/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml b/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml index 90612f21865..2ce44c8601f 100644 --- a/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml +++ b/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml @@ -1,6 +1,4 @@ tasks: -- install: -- ceph: - mon_thrash: revive_delay: 20 thrash_delay: 1 diff --git a/qa/suites/krbd/thrash/thrashers/default.yaml b/qa/suites/krbd/thrash/thrashers/pggrow.yaml similarity index 56% rename from qa/suites/krbd/thrash/thrashers/default.yaml rename to qa/suites/krbd/thrash/thrashers/pggrow.yaml index 14d772583cf..1cd6d291d7a 100644 --- a/qa/suites/krbd/thrash/thrashers/default.yaml +++ b/qa/suites/krbd/thrash/thrashers/pggrow.yaml @@ -1,7 +1,10 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - wrongly marked me down - objects unfound and apparently lost +tasks: - thrashosds: + timeout: 1200 + chance_pgnum_grow: 2 + chance_pgpnum_fix: 1 diff --git a/qa/suites/krbd/thrash/thrashosds-health.yaml b/qa/suites/krbd/thrash/thrashosds-health.yaml new file mode 120000 index 00000000000..ebf7f34f39b --- /dev/null +++ b/qa/suites/krbd/thrash/thrashosds-health.yaml @@ -0,0 +1 @@ +../../../tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/krbd/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled b/qa/suites/krbd/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled deleted file mode 100644 index d61ede1bd66..00000000000 --- a/qa/suites/krbd/thrash/workloads/rbd_workunit_suites_iozone.yaml.disabled +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rbd: - all: - image_size: 20480 -- workunit: - clients: - all: - - suites/iozone.sh -- 2.47.3