qa/suites/rados: whitelist health warnings

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

diff --git a/qa/suites/rados/basic-luminous/scrub_test.yaml b/qa/suites/rados/basic-luminous/scrub_test.yaml
index 07f039aae291591b505faafac0f480034793c43a..0d8c7a3759f80bd7f594f05bee560844bd9fd9e6 100644 (file)
--- a/qa/suites/rados/basic-luminous/scrub_test.yaml
+++ b/qa/suites/rados/basic-luminous/scrub_test.yaml
@@ -15,6 +15,12 @@ overrides:
     - 'attr name mistmatch'
     - 'deep-scrub 1 missing, 0 inconsistent objects'
     - 'failed to pick suitable auth object'
+    - HEALTH_WARN OSDMAP_FLAGS
+    - HEALTH_WARN OSD_
+    - HEALTH_WARN PG_
+    - HEALTH_ERR PG_
+    - HEALTH_ERR OSD_SCRUB_ERRORS
+    - HEALTH_WARN TOO_FEW_PGS
     conf:
       osd:
         osd deep scrub update digest min age: 0

diff --git a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
index 0e1ba010c5b4e808ade807b3d7b6b77ce40b4e5e..0fd43cf6ac73381e123c7789125779eaf2fe17b1 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
+++ b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -1,3 +1,8 @@
+override:
+  ceph:
+    log-whitelist:
+      - HEALTH_WARN OSD_CACHE_NO_HIT_SET
+      - HEALTH_WARN TOO_FEW_PGS
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml
index f69866994417e3aece0d4031356c0d4bfb580721..41a5642f15c414447f886768ccd9fa0ed4eaa0d5 100644 (file)
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -17,6 +17,9 @@ overrides:
       - 'size 1 != size'
       - attr name mismatch
       - Regular scrub request, losing deep-scrub details
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
     conf:
       osd:
         filestore debug inject read err: true

diff --git a/qa/suites/rados/mgr/tasks/failover.yaml b/qa/suites/rados/mgr/tasks/failover.yaml
index e02b8bf2cb078ecacdadfdf29621cc36ed1d19da..be2c623e951b5eee19d46764968c40c9f7a30d9b 100644 (file)
--- a/qa/suites/rados/mgr/tasks/failover.yaml
+++ b/qa/suites/rados/mgr/tasks/failover.yaml
@@ -4,7 +4,10 @@ tasks:
   - ceph:
       # tests may leave mgrs broken, so don't try and call into them
       # to invoke e.g. pg dump during teardown.
-      wait-for-scrub: false  
+      wait-for-scrub: false
+      log-whitelist:
+        - HEALTH_WRN MGR_DOWN
+        - HEALTH_ERR MGR_DOWN
   - cephfs_test_runner:
       modules:
         - tasks.mgr.test_failover

diff --git a/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml b/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
index 2867f2db5ec7c859dc4496e81a24fba640ba5776..c7473bd48b2ad1de10bc879ae21e61baebd0af5d 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
@@ -1,3 +1,8 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - HEALTH_WARN MON_DOWN
+      - HEALTH_WARN TOO_FEW_PGS
 tasks:
 - mon_thrash:
     revive_delay: 90

diff --git a/qa/suites/rados/monthrash/thrashers/many.yaml b/qa/suites/rados/monthrash/thrashers/many.yaml
index fe52bb2bbeb5e7abdbce1403519a4637a5a25632..3755f8b12395806a0cc60d50f45d222c9bb5c942 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/many.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - HEALTH_WARN MON_DOWN
     conf:
       osd:
         mon client ping interval: 4

diff --git a/qa/suites/rados/monthrash/thrashers/one.yaml b/qa/suites/rados/monthrash/thrashers/one.yaml
index 2ce44c8601fa576e95efb2d2a87a89ac553b8b5d..99b66ec242f51aa12374147d48734fdffdfb0161 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/one.yaml
+++ b/qa/suites/rados/monthrash/thrashers/one.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - HEALTH_WARN MON_DOWN
 tasks:
 - mon_thrash:
     revive_delay: 20

diff --git a/qa/suites/rados/monthrash/thrashers/sync-many.yaml b/qa/suites/rados/monthrash/thrashers/sync-many.yaml
index 9868f18159f645fb02f0fecbc7e8890aa1cce1fd..25e40e9b3fbbefa8d1ea4c357bebb7f8a4e489c9 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/sync-many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/sync-many.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - HEALTH_WARN MON_DOWN
     conf:
       mon:
         paxos min: 10

diff --git a/qa/suites/rados/monthrash/thrashers/sync.yaml b/qa/suites/rados/monthrash/thrashers/sync.yaml
index 1e7054c271d86fad3d03b47c2cb82d47dfde56d2..958b08224931d5111a764892977b34ba97251235 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/sync.yaml
+++ b/qa/suites/rados/monthrash/thrashers/sync.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - HEALTH_WARN MON_DOWN
     conf:
       mon:
         paxos min: 10

diff --git a/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml b/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml
index e86bdde1d7d24ccbf1a53d996ba684459546319e..1a504f147142567e23eb27bd1724ee5df84288b8 100644 (file)
--- a/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml
+++ b/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml
@@ -5,5 +5,6 @@ tasks:
     - slow request
     - .*clock.*skew.*
     - clocks not synchronized
+    - HEALTH_WARN MON_CLOCK_SKEW
 - mon_clock_skew_check:
     expect-skew: false

diff --git a/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml b/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
index 1c6c1538b800e8cc1a799e69b2aef0544a38f3e0..87d1d9f13d7f09fe5a55c1f90bf8400b416f3e4b 100644 (file)
--- a/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
+++ b/qa/suites/rados/multimon/tasks/mon_clock_with_skews.yaml
@@ -9,5 +9,6 @@ tasks:
     - slow request
     - .*clock.*skew.*
     - clocks not synchronized
+    - HEALTH_WARN MON_CLOCK_SKEW
 - mon_clock_skew_check:
     expect-skew: true

diff --git a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
index 215d0f08f9b6b0711aa950a668446505ece6a537..3dac70a203562a3777d262b6594a8850fdc35c3b 100644 (file)
--- a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
@@ -12,5 +12,11 @@ tasks:
       global:
         osd max object name len: 460
         osd max object namespace len: 64
+    log-whitelist:
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_ERR PG_
+      - HEALTH_WARN TOO_FEW_PGS
 - ceph_objectstore_tool:
     objects: 20

diff --git a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
index 880628f4fd2b782bc1f35aa8506752e4b05649ae..f03bb4e69ae05a7afe1db301ffab033ed1c9e7e7 100644 (file)
--- a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
+++ b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
@@ -21,6 +21,11 @@ tasks:
     - must scrub before tier agent can activate
     - failsafe engaged, dropping updates
     - failsafe disengaged, no longer dropping updates
+    - HEALTH_WARN OSDMAP_FLAGS
+    - HEALTH_WARN OSD_
+    - HEALTH_WARN PG_
+    - HEALTH_ERR PG_
+    - HEALTH_WARN SMALLER_PG_NUM
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
index 969c40902fb91646a297cc99fe5188ae84a0e090..31c904d2ed7bd4baa2ee4f11f75dd39936fc4011 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
@@ -5,6 +5,9 @@ overrides:
     log-whitelist:
       - MDS in read-only mode
       - force file system read-only
+      - HEALTH_WARN OSD_FLAGS
+      - HEALTH_ERR OSD_FULL
+      - HEALTH_WARN MDS_READ_ONLY
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
index 5009ee617035c8384408160e2fc0a0fd2179bacd..826a4ea21e330950378af7c2a7cc747b82eeb173 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
@@ -3,6 +3,8 @@ roles:
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - HEALTH_WARN OSD_CACHE_NO_HIT_SET
     conf:
       global:
         osd max object name len: 460

diff --git a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
index 9dc1fe7dcc9bfaadfb806e9f68c19208612ac791..38d602aa2dbb2be575f6c2c8606f8ea8559051d6 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
@@ -5,6 +5,8 @@ overrides:
   ceph:
     log-whitelist:
       - is full
+      - HEALTH_ERR POOL_FULL
+      - HEALTH_WARN POOL_NEAR_FULL
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml b/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
index 4c8228b0cd94883a7c650645ba4f264b582a84e9..7f55a885856f37880dae41c9c0c4423c4fd56fc0 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
@@ -10,6 +10,9 @@ tasks:
         osd max object namespace len: 64
     log-whitelist:
       - wrongly marked me down
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton/all/divergent_priors.yaml b/qa/suites/rados/singleton/all/divergent_priors.yaml
index bb7c2b57f50f89594ada345cad9d547e3762a483..ac0f713e9523bf3dbee87d47e82cb8c110b6ea37 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors.yaml
@@ -12,6 +12,11 @@ openstack:
 
 overrides:
   ceph:
+    log-whitelist:
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_WARN DEGRADED_OBJECTS
     conf:
       osd:
         debug osd: 5

diff --git a/qa/suites/rados/singleton/all/divergent_priors2.yaml b/qa/suites/rados/singleton/all/divergent_priors2.yaml
index ab749f1b516ec723768525cfeb2c148de3212478..6c00496eb1fe7f3c7f094d81071b6bdf81c3ed63 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors2.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors2.yaml
@@ -12,6 +12,11 @@ openstack:
 
 overrides:
   ceph:
+    log-whitelist:
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_WARN DEGRADED_OBJECTS
     conf:
       osd:
         debug osd: 5

diff --git a/qa/suites/rados/singleton/all/dump-stuck.yaml b/qa/suites/rados/singleton/all/dump-stuck.yaml
index 7d3b443021bbb9988bfa41e0ffad385aae0f4093..26b8c7c1d38afe2ddc9c8e15a2fadecfe7236fce 100644 (file)
--- a/qa/suites/rados/singleton/all/dump-stuck.yaml
+++ b/qa/suites/rados/singleton/all/dump-stuck.yaml
@@ -11,5 +11,8 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
+      - wrongly marked me down
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
 - dump_stuck:

diff --git a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
index 6ceefe1222e351dd3743196dfb889a5d7d9c8b23..324bc5b9ee5b1fc3fe2b837e3b091c109919a125 100644 (file)
--- a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
@@ -15,5 +15,10 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - objects unfound and apparently lost
+      - objects unfound and apparently lost
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_WARN UNFOUND_OBJECTS
+      - HEALTH_WARN DEGRADED_OBJECTS
 - ec_lost_unfound:

diff --git a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
index 15f4710bd9bf41eee2e609c68bad54cced593fd4..aae7ff82364747436f4a1832538afe0890c6ee5b 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
@@ -14,5 +14,12 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - objects unfound and apparently lost
+      - objects unfound and apparently lost
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_ERR PG_
+      - HEALTH_WARN UNFOUND_OBJECTS
+      - HEALTH_WARN MISPLACED_OBJECTS
+      - HEALTH_WARN DEGRADED_OBJECTS
 - rep_lost_unfound_delete:

diff --git a/qa/suites/rados/singleton/all/lost-unfound.yaml b/qa/suites/rados/singleton/all/lost-unfound.yaml
index 3f22ba3c0136a436445126715aada2f877decb00..9458373a421019eff3f34658318d2d3bbfe54f69 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound.yaml
@@ -14,5 +14,12 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - objects unfound and apparently lost
+      - objects unfound and apparently lost
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
+      - HEALTH_ERR PG_
+      - HEALTH_WARN UNFOUND_OBJECTS
+      - HEALTH_WARN MISPLACED_OBJECTS
+      - HEALTH_WARN DEGRADED_OBJECTS
 - lost_unfound:

diff --git a/qa/suites/rados/singleton/all/osd-backfill.yaml b/qa/suites/rados/singleton/all/osd-backfill.yaml
index f84a0df8d6600dda971209447e719c72049ff6c2..c30bb50b9108fe32e271bd152caed9c96336c3f3 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/rados/singleton/all/osd-backfill.yaml
@@ -14,7 +14,10 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
+      - wrongly marked me down
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
     conf:
       osd:
         osd min pg log entries: 5

diff --git a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
index 773cb2480a6fe31641e6963abc25a46cf20ed587..850671dd8115aca8e7617e560508bfcbe14ae090 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -15,7 +15,10 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
+      - wrongly marked me down
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
     conf:
       osd:
         osd min pg log entries: 5

diff --git a/qa/suites/rados/singleton/all/osd-recovery.yaml b/qa/suites/rados/singleton/all/osd-recovery.yaml
index 214d7f20cc74c322587016208e311e7262beb19c..8e82f1140e49ac3dad9f817a2ec8ba09226a460c 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery.yaml
@@ -14,7 +14,10 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
+      - wrongly marked me down
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
     conf:
       osd:
         osd min pg log entries: 5

diff --git a/qa/suites/rados/singleton/all/peer.yaml b/qa/suites/rados/singleton/all/peer.yaml
index 6e22b44563e9dc0f82e247eac319ca4987caa3db..6f7e11977e8252c83bcaf4c94575f7727ad22389 100644 (file)
--- a/qa/suites/rados/singleton/all/peer.yaml
+++ b/qa/suites/rados/singleton/all/peer.yaml
@@ -17,5 +17,8 @@ tasks:
       global:
         osd pool default min size : 1
     log-whitelist:
-    - objects unfound and apparently lost
+      - objects unfound and apparently lost
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
 - peer:

diff --git a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
index f7e61c962633fb3f349be33d02e9b899fb81d969..05358e6e0ee63c85c760ad29fbdbcc369094b392 100644 (file)
--- a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -13,8 +13,11 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
-    - slow request
+      - wrongly marked me down
+      - slow request
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
 - exec:
     client.0:
       - sudo ceph osd pool create foo 128 128

diff --git a/qa/suites/rados/singleton/all/rebuild-mondb.yaml b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
index c3be13ae6a2cff68fcf7c82a4aa510f93538b68d..ea48501873b58b1edd7c07d65e90d0b36111f7cf 100644 (file)
--- a/qa/suites/rados/singleton/all/rebuild-mondb.yaml
+++ b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
@@ -15,7 +15,11 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - no reply from
+      - no reply from
+      - HEALTH_WARN MON_DOWN
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN PG_
 - full_sequential:
   - radosbench:
       clients: [client.0]

diff --git a/qa/suites/rados/singleton/all/thrash-rados.yaml b/qa/suites/rados/singleton/all/thrash-rados.yaml
deleted file mode 100644 (file)
index 49e3e87..0000000
--- a/qa/suites/rados/singleton/all/thrash-rados.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-roles:
-- - mon.a
-  - mgr.x
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 10 # GB
-tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-- thrashosds:
-    op_delay: 30
-    clean_interval: 120
-    chance_down: .5
-- workunit:
-    clients:
-      all:
-      - rados/load-gen-mix-small.sh

diff --git a/qa/suites/rados/singleton/all/thrash-rados/+ b/qa/suites/rados/singleton/all/thrash-rados/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/singleton/all/thrash-rados/thrash-rados.yaml b/qa/suites/rados/singleton/all/thrash-rados/thrash-rados.yaml
new file mode 100644 (file)
index 0000000..f61897e
--- /dev/null
+++ b/qa/suites/rados/singleton/all/thrash-rados/thrash-rados.yaml
@@ -0,0 +1,27 @@
+roles:
+- - mon.a
+  - mgr.x
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+  - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
+tasks:
+- install:
+- ceph:
+    log-whitelist:
+      - wrongly marked me down
+- thrashosds:
+    op_delay: 30
+    clean_interval: 120
+    chance_down: .5
+- workunit:
+    clients:
+      all:
+      - rados/load-gen-mix-small.sh

diff --git a/qa/suites/rados/singleton/all/thrash-rados/thrashosds-health.yaml b/qa/suites/rados/singleton/all/thrash-rados/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..0b1d7b0
--- /dev/null
+++ b/qa/suites/rados/singleton/all/thrash-rados/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-big/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-isa/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code-isa/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-isa/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-overwrites/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code-overwrites/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-overwrites/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-shec/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code-shec/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-shec/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code/thrashosds-health.yaml b/qa/suites/rados/thrash-erasure-code/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-luminous/thrashosds-health.yaml b/qa/suites/rados/thrash-luminous/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash-luminous/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash/thrashosds-health.yaml b/qa/suites/rados/thrash/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..ebf7f34
--- /dev/null
+++ b/qa/suites/rados/thrash/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..e0426db
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/verify/d-thrash/default.yaml b/qa/suites/rados/verify/d-thrash/default.yaml
deleted file mode 100644 (file)
index d67ff20..0000000
--- a/qa/suites/rados/verify/d-thrash/default.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/d-thrash/default/+ b/qa/suites/rados/verify/d-thrash/default/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/verify/d-thrash/default/default.yaml b/qa/suites/rados/verify/d-thrash/default/default.yaml
new file mode 100644 (file)
index 0000000..d67ff20
--- /dev/null
+++ b/qa/suites/rados/verify/d-thrash/default/default.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: 1
+    chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/verify/d-thrash/default/thrashosds-health.yaml b/qa/suites/rados/verify/d-thrash/default/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..0b1d7b0
--- /dev/null
+++ b/qa/suites/rados/verify/d-thrash/default/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/tasks/thrashosds-health.yaml b/qa/tasks/thrashosds-health.yaml
new file mode 100644 (file)
index 0000000..82ffc7c
--- /dev/null
+++ b/qa/tasks/thrashosds-health.yaml
@@ -0,0 +1,14 @@
+override:
+  ceph:
+    log-whitelist:
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN OSD_
+      - HEALTH_WARN OSDMAP_FLAGS
+      - HEALTH_WARN PG_
+      - HEALTH_ERR OSD_
+      - HEALTH_ERR PG_
+      - HEALTH_WARN SMALLER_PGP_NUM
+      - HEALTH_WARN DEGRADED_OBJECTS
+      - HEALTH_WARN MISPLACED_OBJECTS
+      - HEALTH_WARN SLOW_REQUESTS
+      - HEALTH_WARN TOO_FEW_PGS