From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 10 Jul 2017 14:54:24 +0000 (+0200)
Subject: qa/suites/krbd: reorganize thrash tests
X-Git-Tag: v12.1.2~214^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0635c25e74bfd3bd872088f6e5fcbfbb46b6d3e8;p=ceph.git

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 <idryomov@gmail.com>
---

diff --git a/qa/suites/krbd/thrash/ceph/ceph.yaml b/qa/suites/krbd/thrash/ceph/ceph.yaml
new file mode 100644
index 000000000000..2030acb90836
--- /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/default.yaml b/qa/suites/krbd/thrash/thrashers/default.yaml
deleted file mode 100644
index 14d772583cf7..000000000000
--- a/qa/suites/krbd/thrash/thrashers/default.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-- thrashosds:
diff --git a/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml b/qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml
index 90612f21865f..2ce44c8601fa 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/pggrow.yaml b/qa/suites/krbd/thrash/thrashers/pggrow.yaml
new file mode 100644
index 000000000000..1cd6d291d7a7
--- /dev/null
+++ b/qa/suites/krbd/thrash/thrashers/pggrow.yaml
@@ -0,0 +1,10 @@
+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 000000000000..ebf7f34f39bc
--- /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 d61ede1bd663..000000000000
--- 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