qa/suites/upgrade/*-x: add more PG states to log-ignorelist

Cover warnings like

  [WRN] pg 2.7 is active+undersized+degraded, acting [6,7]" in cluster log

This is based on commit 4a4fc7bad533 ("qa: ignore pg
availability/degraded warnings").

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

diff --git a/qa/suites/upgrade/quincy-x/parallel/0-start.yaml b/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
index 8bd185097806a7b416d3584c0296c32d8623c22b..990718f14f9450da27fce3032b8e3c8c0a934830 100644 (file)
--- a/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
+++ b/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
@@ -39,7 +39,10 @@ overrides:
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_AVAILABILITY
       - PG_DEGRADED
       - Reduced data availability
       - Degraded data redundancy
+      - pg .* is stuck inactive
+      - pg .* is .*degraded
       - OSDMAP_FLAGS

diff --git a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
index 4d1b056ff325a1665b352a9294110d473ca8a53c..24b5c9716a7da25d9fb797b821247dc8e98485a7 100644 (file)
--- a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
@@ -8,11 +8,13 @@ overrides:
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_AVAILABILITY
       - PG_DEGRADED
       - Reduced data availability
       - Degraded data redundancy
+      - pg .* is stuck inactive
+      - pg .* is .*degraded
       - OSDMAP_FLAGS
-      - PG_AVAILABILITY
 tasks:
 - install:
     branch: quincy

diff --git a/qa/suites/upgrade/reef-x/parallel/0-start.yaml b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
index 8bd185097806a7b416d3584c0296c32d8623c22b..990718f14f9450da27fce3032b8e3c8c0a934830 100644 (file)
--- a/qa/suites/upgrade/reef-x/parallel/0-start.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
@@ -39,7 +39,10 @@ overrides:
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_AVAILABILITY
       - PG_DEGRADED
       - Reduced data availability
       - Degraded data redundancy
+      - pg .* is stuck inactive
+      - pg .* is .*degraded
       - OSDMAP_FLAGS

diff --git a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
index 3239f0def3d158a9ec52ae0d958da11d5937536f..80aba7c594a94e0923ad1a0d1c2ab5270c7a0e5f 100644 (file)
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -8,11 +8,13 @@ overrides:
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_AVAILABILITY
       - PG_DEGRADED
       - Reduced data availability
       - Degraded data redundancy
+      - pg .* is stuck inactive
+      - pg .* is .*degraded
       - OSDMAP_FLAGS
-      - PG_AVAILABILITY
 tasks:
 - install:
     branch: reef