qa/suites/rados/thrash: extra cluster create

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/thrash/ceph.yaml b/qa/suites/rados/thrash/ceph.yaml
new file mode 100644 (file)
index 0000000..2030acb
--- /dev/null
+++ b/qa/suites/rados/thrash/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:

diff --git a/qa/suites/rados/thrash/thrashers/default.yaml b/qa/suites/rados/thrash/thrashers/default.yaml
index 5df84bedabeb1768632e78891e7e8fdf0800cc3c..e2f3c64c146560d3d48243dcd49ad355b54f30ab 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/default.yaml
+++ b/qa/suites/rados/thrash/thrashers/default.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -11,6 +10,7 @@ tasks:
         osd scrub max interval: 120
         osd max backfills: 3
         osd snap trim sleep: 2
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/qa/suites/rados/thrash/thrashers/mapgap.yaml b/qa/suites/rados/thrash/thrashers/mapgap.yaml
index 0ac5cfc49c69b72ed467810848773386ae233d65..b039b6198111ca621999010b33fe1c3eead7771d 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash/thrashers/mapgap.yaml
@@ -1,5 +1,9 @@
 overrides:
   ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - osd_map_cache_size
     conf:
       mon:
         mon min osdmap epochs: 2
@@ -10,12 +14,6 @@ overrides:
         osd scrub during recovery: false
         osd max backfills: 6
 tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - osd_map_cache_size
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 0.25

diff --git a/qa/suites/rados/thrash/thrashers/morepggrow.yaml b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
index a22f80c584558d5cdf50cf0ea5c45b94677eb04e..5565d701e32d09f15a46a0a251d058bd1b81395b 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/morepggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     conf:
       osd:
         osd scrub min interval: 60
@@ -13,6 +12,7 @@ tasks:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 3

diff --git a/qa/suites/rados/thrash/thrashers/none.yaml b/qa/suites/rados/thrash/thrashers/none.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/none.yaml
+++ b/qa/suites/rados/thrash/thrashers/none.yaml
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/qa/suites/rados/thrash/thrashers/pggrow.yaml b/qa/suites/rados/thrash/thrashers/pggrow.yaml
index 30d8957c77b4a91bf3d00db65e75c8daa63e185f..817bbd48578ed6be82d904c67ee079688e648464 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/pggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -11,6 +10,7 @@ tasks:
         filestore odsync write: true
         osd max backfills: 2
         osd snap trim sleep: .5
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2