qa: 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 0d8c7a3759f80bd7f594f05bee560844bd9fd9e6..d87f5bfdd35b417931e57ae5838c649a0f457b9e 100644 (file)
--- a/qa/suites/rados/basic-luminous/scrub_test.yaml
+++ b/qa/suites/rados/basic-luminous/scrub_test.yaml
@@ -15,12 +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
+    - overall HEALTH_
+    - (OSDMAP_FLAGS)
+    - (OSD_
+    - (PG_
+    - (OSD_SCRUB_ERRORS)
+    - (TOO_FEW_PGS)
     conf:
       osd:
         osd deep scrub update digest min age: 0

diff --git a/qa/suites/rados/basic/tasks/rados_api_tests.yaml b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
index b66423988d7cf17dd08d9b772c9809e3c3522111..1d77207d2b43b529700bab71f1be6e1a04c3cec9 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/basic/tasks/rados_api_tests.yaml
@@ -3,6 +3,11 @@ overrides:
     log-whitelist:
     - reached quota
     - wrongly marked me down
+    - overall HEALTH_
+    - (POOL_FULL)
+    - (SMALLER_PGP_NUM)
+    - (CACHE_POOL_NO_HIT_SET)
+    - (CACHE_POOL_NEAR_FULL)
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rados/basic/tasks/rados_python.yaml b/qa/suites/rados/basic/tasks/rados_python.yaml
index d8b332b343dc6dbe70c20c6c5d318757de9ff197..aa22ccd16e1bef22abd288609dc6dbd5e64f415f 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_python.yaml
+++ b/qa/suites/rados/basic/tasks/rados_python.yaml
@@ -2,6 +2,11 @@ overrides:
   ceph:
     log-whitelist:
     - wrongly marked me down
+    - overall HEALTH_
+    - (OSDMAP_FLAGS)
+    - (PG_
+    - (OSD_
+    - (OBJECT_
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
index 0fd43cf6ac73381e123c7789125779eaf2fe17b1..ded794c17412f68fc9a551a5f69f79854dc98177 100644 (file)
--- a/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
+++ b/qa/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -1,8 +1,9 @@
-override:
+overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN OSD_CACHE_NO_HIT_SET
-      - HEALTH_WARN TOO_FEW_PGS
+      - overall HEALTH_
+      - (CACHE_POOL_NO_HIT_SET)
+      - (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 41a5642f15c414447f886768ccd9fa0ed4eaa0d5..8401c1a303f0cd2a8644bc54a7fd243b5a9ff6b4 100644 (file)
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -17,9 +17,10 @@ overrides:
       - 'size 1 != size'
       - attr name mismatch
       - Regular scrub request, losing deep-scrub details
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (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 be2c623e951b5eee19d46764968c40c9f7a30d9b..fd5eb8515c90554f752e02d41f57b89730bee385 100644 (file)
--- a/qa/suites/rados/mgr/tasks/failover.yaml
+++ b/qa/suites/rados/mgr/tasks/failover.yaml
@@ -6,8 +6,9 @@ tasks:
       # to invoke e.g. pg dump during teardown.
       wait-for-scrub: false
       log-whitelist:
-        - HEALTH_WRN MGR_DOWN
-        - HEALTH_ERR MGR_DOWN
+        - overall HEALTH_
+        - (MGR_DOWN)
+        - (PG_
   - 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 c7473bd48b2ad1de10bc879ae21e61baebd0af5d..38570fcf615ef2ac9c7fd4751fedd55834f5cb27 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
@@ -1,8 +1,9 @@
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN MON_DOWN
-      - HEALTH_WARN TOO_FEW_PGS
+      - overall HEALTH_
+      - (MON_DOWN)
+      - (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 3755f8b12395806a0cc60d50f45d222c9bb5c942..e940c42ad7435252fcbf88426f48efd44528ca0e 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/many.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN MON_DOWN
+      - overall HEALTH_
+      - (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 99b66ec242f51aa12374147d48734fdffdfb0161..92c9eb3a808ff490d22e6526ad41834552527cbf 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/one.yaml
+++ b/qa/suites/rados/monthrash/thrashers/one.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN MON_DOWN
+      - overall HEALTH_
+      - (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 25e40e9b3fbbefa8d1ea4c357bebb7f8a4e489c9..68020cd665143267b878db27a2cb451d524b507e 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/sync-many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/sync-many.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN MON_DOWN
+      - overall HEALTH_
+      - (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 958b08224931d5111a764892977b34ba97251235..b07f8b511f65e803a7c82d38c1df3e616ddccb12 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/sync.yaml
+++ b/qa/suites/rados/monthrash/thrashers/sync.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN MON_DOWN
+      - overall HEALTH_
+      - (MON_DOWN)
     conf:
       mon:
         paxos min: 10

diff --git a/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml b/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
index b536557fdbac285810d08e102f927a5cd73666f3..0834f9c34c1832caf497ca39f0bc675e6e901841 100644 (file)
--- a/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
+++ b/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
@@ -2,6 +2,12 @@ overrides:
   ceph:
     log-whitelist:
       - reached quota
+      - overall HEALTH_
+      - (CACHE_POOL_NO_HIT_SET)
+      - (POOL_FULL)
+      - (REQUEST_SLOW)
+      - (MON_DOWN)
+      - (PG_
     conf:
       global:
         debug objecter: 20

diff --git a/qa/suites/rados/monthrash/workloads/rados_mon_workunits.yaml b/qa/suites/rados/monthrash/workloads/rados_mon_workunits.yaml
index 31465cffe712756e6756bf4f5a72d6fbc7959262..86818b58dff70e875bd4e058ea71d6944d4c004e 100644 (file)
--- a/qa/suites/rados/monthrash/workloads/rados_mon_workunits.yaml
+++ b/qa/suites/rados/monthrash/workloads/rados_mon_workunits.yaml
@@ -2,6 +2,9 @@ overrides:
   ceph:
     log-whitelist:
     - wrongly marked me down
+    - overall HEALTH_
+    - (PG_
+    - (MON_DOWN)
 tasks:
 - workunit:
     clients:

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 1a504f147142567e23eb27bd1724ee5df84288b8..ec761e2955ee24b86a177c7089067c85333129fa 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,6 +5,7 @@ tasks:
     - slow request
     - .*clock.*skew.*
     - clocks not synchronized
-    - HEALTH_WARN MON_CLOCK_SKEW
+    - overall HEALTH_
+    - (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 87d1d9f13d7f09fe5a55c1f90bf8400b416f3e4b..2bba607152ea2cc12f07129c9bc5c61d57a89cfc 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,6 +9,7 @@ tasks:
     - slow request
     - .*clock.*skew.*
     - clocks not synchronized
-    - HEALTH_WARN MON_CLOCK_SKEW
+    - overall HEALTH_
+    - (MON_CLOCK_SKEW)
 - mon_clock_skew_check:
     expect-skew: true

diff --git a/qa/suites/rados/multimon/tasks/mon_recovery.yaml b/qa/suites/rados/multimon/tasks/mon_recovery.yaml
index 94721ea53a49560b14eb68bfe33cd6a935f4adaf..4234bf73e6816b22ab34f88905ac313dfe9787c5 100644 (file)
--- a/qa/suites/rados/multimon/tasks/mon_recovery.yaml
+++ b/qa/suites/rados/multimon/tasks/mon_recovery.yaml
@@ -1,4 +1,7 @@
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (MON_DOWN)
 - mon_recovery:

diff --git a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
index 3dac70a203562a3777d262b6594a8850fdc35c3b..2001faa3fe81bfd009738fbeb0c4ce6fc754ba3a 100644 (file)
--- a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
@@ -13,10 +13,10 @@ tasks:
         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
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (TOO_FEW_PGS)
 - ceph_objectstore_tool:
     objects: 20

diff --git a/qa/suites/rados/rest/mgr-restful.yaml b/qa/suites/rados/rest/mgr-restful.yaml
index 571857c251107cd231480877c5975c51f65166dd..5dd16fda288cfed0e27508df5b78afaa204568d2 100644 (file)
--- a/qa/suites/rados/rest/mgr-restful.yaml
+++ b/qa/suites/rados/rest/mgr-restful.yaml
@@ -3,6 +3,9 @@ roles:
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (MGR_DOWN)
 - exec:
     mon.a:
       - ceph config-key put mgr/restful/x/server_addr 127.0.0.1

diff --git a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
index f03bb4e69ae05a7afe1db301ffab033ed1c9e7e7..7e1a1f7b389a4a0fd3e8306cb8f756f6440add12 100644 (file)
--- a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
+++ b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
@@ -21,11 +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
+    - overall HEALTH_
+    - (OSDMAP_FLAGS)
+    - (OSD_
+    - (PG_
+    - (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 31c904d2ed7bd4baa2ee4f11f75dd39936fc4011..3aaca875940323912c0a43ef9f10d6e7531929c0 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,9 +5,10 @@ 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
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_FULL)
+      - (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 826a4ea21e330950378af7c2a7cc747b82eeb173..ac64165aaaa6a6d47ebd7ab24968196fd6b917d8 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
@@ -4,7 +4,8 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-      - HEALTH_WARN OSD_CACHE_NO_HIT_SET
+      - overall HEALTH_
+      - (CACHE_POOL_NO_HIT_SET)
     conf:
       global:
         osd max object name len: 460

diff --git a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
index e0badd4d3afad51ef57f4a2f17005ea39faa85d4..1b777ab0f00b753fc76524441b5e259bce3b6654 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
@@ -8,6 +8,9 @@ roles:
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (CACHE_POOL_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 38d602aa2dbb2be575f6c2c8606f8ea8559051d6..5eb42f4dd6390cf0fffcf894f3f78b80c4cbf06f 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
@@ -5,8 +5,10 @@ overrides:
   ceph:
     log-whitelist:
       - is full
-      - HEALTH_ERR POOL_FULL
-      - HEALTH_WARN POOL_NEAR_FULL
+      - overall HEALTH_
+      - (POOL_FULL)
+      - (POOL_NEAR_FULL)
+      - (CACHE_POOL_NO_HIT_SET)
 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 7f55a885856f37880dae41c9c0c4423c4fd56fc0..749bd8d39c3be04602c41063c4fc8fc8e4d2ced8 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
@@ -10,9 +10,10 @@ tasks:
         osd max object namespace len: 64
     log-whitelist:
       - wrongly marked me down
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
index b73899738e674779484f4967df71a8815476374d..cadf3044a1d12806a86f25927fd48ed3e3566d3e 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
@@ -11,6 +11,11 @@ roles:
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (PG_
+      - (OSD_
+      - (OBJECT_
     conf:
       osd:
         osd debug reject backfill probability: .3

diff --git a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
index e5d5702a32b65084d8fd92fc77a8a00600da83f5..65af1a2e817c513f531d076974412a199fd95842 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/valgrind-leaks.yaml
@@ -7,6 +7,9 @@ overrides:
       flavor: notcmalloc
       debuginfo: true
   ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (PG_
     conf:
       global:
         osd heartbeat grace: 40

diff --git a/qa/suites/rados/singleton/all/divergent_priors.yaml b/qa/suites/rados/singleton/all/divergent_priors.yaml
index ac0f713e9523bf3dbee87d47e82cb8c110b6ea37..f15fb889615875eb311046c0907f0d46270c0d20 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors.yaml
@@ -13,10 +13,11 @@ openstack:
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
-      - HEALTH_WARN DEGRADED_OBJECTS
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
     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 6c00496eb1fe7f3c7f094d81071b6bdf81c3ed63..90d8b1838b9860002798eb8eb723dff794e22d4c 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors2.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors2.yaml
@@ -13,10 +13,11 @@ openstack:
 overrides:
   ceph:
     log-whitelist:
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
-      - HEALTH_WARN DEGRADED_OBJECTS
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
     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 26b8c7c1d38afe2ddc9c8e15a2fadecfe7236fce..f3900e121fe72e05cd6e89614fea30648af29475 100644 (file)
--- a/qa/suites/rados/singleton/all/dump-stuck.yaml
+++ b/qa/suites/rados/singleton/all/dump-stuck.yaml
@@ -12,7 +12,8 @@ tasks:
 - ceph:
     log-whitelist:
       - wrongly marked me down
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (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 324bc5b9ee5b1fc3fe2b837e3b091c109919a125..e095fd0d58690f3eae9d6345a713899cf52340c4 100644 (file)
--- a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
@@ -16,9 +16,9 @@ tasks:
 - ceph:
     log-whitelist:
       - objects unfound and apparently lost
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
-      - HEALTH_WARN UNFOUND_OBJECTS
-      - HEALTH_WARN DEGRADED_OBJECTS
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_
 - 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 aae7ff82364747436f4a1832538afe0890c6ee5b..5502b5c9b0ffc42db082f5b61c838ec0b38ce8cb 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
@@ -15,11 +15,9 @@ tasks:
 - ceph:
     log-whitelist:
       - 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
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_
 - 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 9458373a421019eff3f34658318d2d3bbfe54f69..bb0bb2c0afe4978e565346c779afd79fae4fd4e6 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound.yaml
@@ -15,11 +15,9 @@ tasks:
 - ceph:
     log-whitelist:
       - 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
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_
 - lost_unfound:

diff --git a/qa/suites/rados/singleton/all/mon-thrasher.yaml b/qa/suites/rados/singleton/all/mon-thrasher.yaml
index 1b4622998f9ba623486e034060fd049686f60c5d..66a1e905f3b83e28039de0d92dc210687290ee49 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-thrasher.yaml
+++ b/qa/suites/rados/singleton/all/mon-thrasher.yaml
@@ -13,6 +13,10 @@ openstack:
 tasks:
 - install:
 - ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (MON_DOWN)
+      - (PG_
 - mon_thrash:
     revive_delay: 20
     thrash_delay: 1

diff --git a/qa/suites/rados/singleton/all/osd-backfill.yaml b/qa/suites/rados/singleton/all/osd-backfill.yaml
index c30bb50b9108fe32e271bd152caed9c96336c3f3..84e2273d3f8831c43998f62dd92d05672f2bc8e9 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/rados/singleton/all/osd-backfill.yaml
@@ -15,9 +15,11 @@ tasks:
 - ceph:
     log-whitelist:
       - wrongly marked me down
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_
     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 850671dd8115aca8e7617e560508bfcbe14ae090..60789d5ca68c616106bc6181f5f6d58617c682f7 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -16,9 +16,11 @@ tasks:
 - ceph:
     log-whitelist:
       - wrongly marked me down
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_
     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 8e82f1140e49ac3dad9f817a2ec8ba09226a460c..d6e5e957f24c687306119d72db22aa052a2693a3 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery.yaml
@@ -15,9 +15,11 @@ tasks:
 - ceph:
     log-whitelist:
       - wrongly marked me down
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
     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 6f7e11977e8252c83bcaf4c94575f7727ad22389..e87cd543ce6c91fb30e30a0e54ee01699842b465 100644 (file)
--- a/qa/suites/rados/singleton/all/peer.yaml
+++ b/qa/suites/rados/singleton/all/peer.yaml
@@ -18,7 +18,8 @@ tasks:
         osd pool default min size : 1
     log-whitelist:
       - objects unfound and apparently lost
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (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 05358e6e0ee63c85c760ad29fbdbcc369094b392..856b08dd4373512eae1482c67fd141536216d82e 100644 (file)
--- a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -15,9 +15,10 @@ tasks:
     log-whitelist:
       - wrongly marked me down
       - slow request
-      - HEALTH_WARN OSDMAP_FLAGS
-      - HEALTH_WARN OSD_
-      - HEALTH_WARN PG_
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
 - exec:
     client.0:
       - sudo ceph osd pool create foo 128 128

diff --git a/qa/suites/rados/singleton/all/radostool.yaml b/qa/suites/rados/singleton/all/radostool.yaml
index 8bc9dbdcd0f06dbe8d82c29af89b2224c855544b..700b3a33a3cfbfa5da39224746f70697da1ac837 100644 (file)
--- a/qa/suites/rados/singleton/all/radostool.yaml
+++ b/qa/suites/rados/singleton/all/radostool.yaml
@@ -17,6 +17,8 @@ tasks:
     - had wrong client addr
     - had wrong cluster addr
     - reached quota
+    - overall HEALTH_
+    - (POOL_FULL)
 - workunit:
     clients:
       all:

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

diff --git a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
index c64593212a5f2789e6106085ea82d652766eab9f..97da1379096082045091fb5f99345ce581aa6d81 100644 (file)
--- a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
+++ b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
@@ -6,5 +6,11 @@ tasks:
 - install:
 - ceph:
     fs: xfs
+    log-whitelist:
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
 - resolve_stuck_peering:
 

diff --git a/qa/suites/rados/singleton/all/rest-api.yaml b/qa/suites/rados/singleton/all/rest-api.yaml
index cbd90e4097da0267df52976b788505efe6e5592a..77c881b0ee502f2d0cf26c4f3003bce045603c02 100644 (file)
--- a/qa/suites/rados/singleton/all/rest-api.yaml
+++ b/qa/suites/rados/singleton/all/rest-api.yaml
@@ -16,8 +16,13 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
-    - had wrong client addr
+      - wrongly marked me down
+      - had wrong client addr
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
     conf:
       client.rest0:
         debug ms: 1

diff --git a/qa/suites/rados/singleton/all/thrash-eio.yaml b/qa/suites/rados/singleton/all/thrash-eio.yaml
index a70636549cd53db21a6a51000d52b296fa1e4892..6ff629033cd07a3640e723b1f861351491825b31 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@ -24,6 +24,11 @@ tasks:
     - wrongly marked me down
     - missing primary copy of
     - objects unfound and apparently lost
+    - overall HEALTH_
+    - (OSDMAP_FLAGS)
+    - (REQUEST_SLOW)
+    - (PG_
+    - (OSD_
 - thrashosds:
     op_delay: 30
     clean_interval: 120

diff --git a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
index 1875da409a25e77704ae37ba0b1d262795dbf2e4..02fee3e88ea7dfbca5d7a2643d6fe1f663538e64 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
+++ b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
@@ -16,8 +16,10 @@ tasks:
 - install:
 - ceph:
     log-whitelist:
-    - wrongly marked me down
-    - slow request
+      - wrongly marked me down
+      - slow request
+      - overall HEALTH_
+      - (CACHE_POOL_
 - exec:
     client.0:
       - sudo ceph osd pool create base 4

diff --git a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
index ad1fd17d5f589887b0443b2925e06ee7136b2204..3efdb955fe62c15e315f89808cc322e5ae4c3d14 100644 (file)
--- a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
+++ b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
@@ -22,6 +22,11 @@ tasks:
         debug objecter: 20
         debug rados: 20
     log-whitelist:
-    - objects unfound and apparently lost
+      - objects unfound and apparently lost
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (OBJECT_DEGRADED)
 - watch_notify_same_primary:
     clients: [client.0]

diff --git a/qa/suites/rados/verify/tasks/mon_recovery.yaml b/qa/suites/rados/verify/tasks/mon_recovery.yaml
index 6986303409ee73c71c59fef9e7cbae107caeb568..412db863022be8ecb718d4fe14b3cb02dc25ece6 100644 (file)
--- a/qa/suites/rados/verify/tasks/mon_recovery.yaml
+++ b/qa/suites/rados/verify/tasks/mon_recovery.yaml
@@ -1,2 +1,9 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (MON_DOWN)
+      - (OSDMAP_FLAGS)
+      - (SMALLER_PGP_NUM)
 tasks:
 - mon_recovery:

diff --git a/qa/suites/rados/verify/tasks/rados_api_tests.yaml b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
index 11e3858f6a7da0b6b0a64c21193347981eaac712..7c06248d25492c27c8ec5d7c0d995873ab56a52b 100644 (file)
--- a/qa/suites/rados/verify/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -2,6 +2,12 @@ overrides:
   ceph:
     log-whitelist:
       - reached quota
+      - overall HEALTH_
+      - (CACHE_POOL_NO_HIT_SET)
+      - (POOL_FULL)
+      - (SMALLER_PGP_NUM)
+      - (REQUEST_SLOW)
+      - (CACHE_POOL_NEAR_FULL)
     conf:
       client:
         debug ms: 1

diff --git a/qa/tasks/thrashosds-health.yaml b/qa/tasks/thrashosds-health.yaml
index 82ffc7c4fabe98f0c6f45378ff1643d334723324..7113e5948aa2b939271925c3bbf7746697e1b9ca 100644 (file)
--- a/qa/tasks/thrashosds-health.yaml
+++ b/qa/tasks/thrashosds-health.yaml
@@ -1,14 +1,13 @@
-override:
+overrides:
   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
+      - overall HEALTH_
+      - (OSDMAP_FLAGS)
+      - (OSD_
+      - (PG_
+      - (POOL_
+      - (CACHE_POOL_
+      - (SMALLER_PGP_NUM)
+      - (OBJECT_
+      - (REQUEST_SLOW)
+      - (TOO_FEW_PGS)