qa/tasks/ceph: wait for OSDs to go down before checking logs

We were previously starting to check the logs before all OSDs were
fully down, which could cause the test to fail by missing the expected
failure message.

Fixes: https://tracker.ceph.com/issues/67999
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/0-cluster/start.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/0-cluster/start.yaml
index 57e455ba78d633a7cacd446fd95626fbfb82682d..a6d6f845140936625b01fa557f471ef95ee1d26f 100644 (file)
--- a/qa/suites/upgrade/quincy-x/filestore-remove-check/0-cluster/start.yaml
+++ b/qa/suites/upgrade/quincy-x/filestore-remove-check/0-cluster/start.yaml
@@ -19,6 +19,20 @@ overrides:
       - \(MGR_DOWN\)
       - slow request
       - \(MON_MSGR2_NOT_ENABLED\)
+      - \(OSD_DOWN\)
+      - \(OSD_HOST_DOWN\)
+      - \(POOL_APP_NOT_ENABLED\)
+      - OSD_DOWN
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_DEGRADED
+      - Reduced data availability
+      - Degraded data redundancy
+      - OSDMAP_FLAGS
+      - OSD_ROOT_DOWN
+
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"

diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/1-ceph-install/quincy.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/1-ceph-install/quincy.yaml
index e4897db4d35d885ee8891ad93476e968a79e1163..48cfa2f756f09a7d67fe7d0778465a1515b306fd 100644 (file)
--- a/qa/suites/upgrade/quincy-x/filestore-remove-check/1-ceph-install/quincy.yaml
+++ b/qa/suites/upgrade/quincy-x/filestore-remove-check/1-ceph-install/quincy.yaml
@@ -18,9 +18,6 @@ tasks:
       mon:
         mon_warn_on_insecure_global_id_reclaim: false
         mon_warn_on_insecure_global_id_reclaim_allowed: false
-    log-ignorelist:
-      - Not found or unloadable
-      - evicting unresponsive client
 - exec:
     osd.0:
       - ceph osd require-osd-release quincy
@@ -30,14 +27,3 @@ overrides:
     conf:
       mon:
         mon warn on osd down out interval zero: false
-    log-ignorelist:
-      - \(POOL_APP_NOT_ENABLED\)
-      - OSD_DOWN
-      - mons down
-      - mon down
-      - MON_DOWN
-      - out of quorum
-      - PG_DEGRADED
-      - Reduced data availability
-      - Degraded data redundancy
-      - OSDMAP_FLAGS

diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/2 - upgrade.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/2 - upgrade.yaml
index 6aa429f18b524f64392b9cf9c49eca04a434d579..fe4ff9bb1133fbca52518b6f14a05cd0bc112756 100644 (file)
--- a/qa/suites/upgrade/quincy-x/filestore-remove-check/2 - upgrade.yaml
+++ b/qa/suites/upgrade/quincy-x/filestore-remove-check/2 - upgrade.yaml
@@ -3,14 +3,13 @@ meta:
    install upgrade ceph/-x on cluster
    restart : mons, osd.*
 tasks:
+- print: "**** start install.upgrade of nodes"
 - install.upgrade:
-    mon.a:
-- exec:
-    osd.0:
-      - ceph osd require-osd-release quincy
+    all:
 - print: "**** done install.upgrade of nodes"
+- print: "**** start ceph.restart of all osds"
 - ceph.restart:
-    daemons: [mon.a,mgr.x,osd.0,osd.1,osd.2]
+    daemons: [osd.0,osd.1,osd.2]
     mon-health-to-clog: false
     wait-for-healthy: false
     wait-for-osds-up: false