qa/suites/upgrade/reef-x: ignore more POOL_FULL variants

Cover warnings like

  [WRN] POOL_FULL: 2 pool(s) full" in cluster log
  [WRN] pool 'test-librbd-smithi184-145008-24' is full (running out of quota)" in cluster log
  [WRN] Health detail: HEALTH_WARN 2 pool(s) full" in cluster log

POOL_FULL is already ignored, but only in a parenthesized form.  The
"... (XYZ)" vs "XYZ: ..." variety isn't specific to POOL_FULL, so get
rid of parenthesis throughout.  While at it, drop POOL_APP_NOT_ENABLED,
PG_AVAILABILITY and MON_DOWN which are duplicated in *-start.yaml.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit b957e9bc7660f60f55f6627a707e11d15fed6dd3)

diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml
index 5e995da7d2c72b46262b972eb4361814f503e096..fa93b2f2ece29f9c0128144b025209ba8e641632 100644 (file)
--- a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml
@@ -1,20 +1,19 @@
 overrides:
   ceph:
     log-ignorelist:
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(OSD_SLOW_PING_TIME
+      - MDS_ALL_DOWN
+      - MDS_UP_LESS_THAN_MAX
+      - OSD_SLOW_PING_TIME
       - reached quota
+      - running out of quota
       - overall HEALTH_
-      - \(CACHE_POOL_NO_HIT_SET\)
-      - \(POOL_FULL\)
-      - \(SMALLER_PGP_NUM\)
-      - \(SLOW_OPS\)
-      - \(CACHE_POOL_NEAR_FULL\)
-      - \(POOL_APP_NOT_ENABLED\)
-      - \(PG_AVAILABILITY\)
-      - \(OBJECT_MISPLACED\)
+      - CACHE_POOL_NO_HIT_SET
+      - pool\(s\) full
+      - POOL_FULL
+      - SMALLER_PGP_NUM
+      - SLOW_OPS
+      - CACHE_POOL_NEAR_FULL
+      - OBJECT_MISPLACED
       - slow request
-      - \(MON_DOWN\)
       - noscrub
       - nodeep-scrub

diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml
index 5e995da7d2c72b46262b972eb4361814f503e096..fa93b2f2ece29f9c0128144b025209ba8e641632 100644 (file)
--- a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml
@@ -1,20 +1,19 @@
 overrides:
   ceph:
     log-ignorelist:
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(OSD_SLOW_PING_TIME
+      - MDS_ALL_DOWN
+      - MDS_UP_LESS_THAN_MAX
+      - OSD_SLOW_PING_TIME
       - reached quota
+      - running out of quota
       - overall HEALTH_
-      - \(CACHE_POOL_NO_HIT_SET\)
-      - \(POOL_FULL\)
-      - \(SMALLER_PGP_NUM\)
-      - \(SLOW_OPS\)
-      - \(CACHE_POOL_NEAR_FULL\)
-      - \(POOL_APP_NOT_ENABLED\)
-      - \(PG_AVAILABILITY\)
-      - \(OBJECT_MISPLACED\)
+      - CACHE_POOL_NO_HIT_SET
+      - pool\(s\) full
+      - POOL_FULL
+      - SMALLER_PGP_NUM
+      - SLOW_OPS
+      - CACHE_POOL_NEAR_FULL
+      - OBJECT_MISPLACED
       - slow request
-      - \(MON_DOWN\)
       - noscrub
       - nodeep-scrub