qa: fix log errors for cephadm tests

This fixes a lot of errors induced by the log scrapper check.

Fixes: https://tracker.ceph.com/issues/66751
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 53b462764c6fe11282b6cdb21131c176c1ed2350)

diff --git a/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml b/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml
index fb407420562101e97ebe7faec5493d5ab55a951e..1556e312e31cf657b750981cf13ceb09201ab6a3 100644 (file)
--- a/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml
+++ b/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml
@@ -7,3 +7,4 @@ overrides:
   ceph:
     log-ignorelist:
       - MGR_DOWN
+      - CEPHADM_FAILED_DAEMON

diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml
index 7559885b971513ff3f46b2d0797c4450ed4513bc..c48b61198d7a0e45a62228d047535ceeda109164 100644 (file)
--- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml
+++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - CEPHADM_REFRESH_FAILED
 tasks:
 - vip.exec:
     host.a:

diff --git a/qa/suites/orch/cephadm/osds/1-start.yaml b/qa/suites/orch/cephadm/osds/1-start.yaml
index 7f2e4b2feb728414fb4455a96dc877f564973826..90f49cc2adfff9cee564682e4ead1b7cb05a2693 100644 (file)
--- a/qa/suites/orch/cephadm/osds/1-start.yaml
+++ b/qa/suites/orch/cephadm/osds/1-start.yaml
@@ -22,6 +22,7 @@ overrides:
   ceph:
     log-ignorelist:
       - OSD_DOWN
+      - CEPHADM_FAILED_DAEMON
     conf:
       osd:
         osd shutdown pgref assert: true

diff --git a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml
index 350f76c5daea95835dec34de82e38396eee43e1f..418e6848073848b2a07ec2ea6778a506c1e708a5 100644 (file)
--- a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml
+++ b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml
@@ -24,3 +24,6 @@ overrides:
         osd shutdown pgref assert: true
     log-only-match:
       - CEPHADM_
+    log-ignorelist:
+      - CEPHADM_DAEMON_PLACE_FAIL
+      - CEPHADM_FAILED_DAEMON

diff --git a/qa/suites/orch/cephadm/smoke-small/start.yaml b/qa/suites/orch/cephadm/smoke-small/start.yaml
index f736c7bf09395a73a5e0191a494acaa344629bfa..7d89f23d3f85e7c64a63411305ad30f939cfb9c2 100644 (file)
--- a/qa/suites/orch/cephadm/smoke-small/start.yaml
+++ b/qa/suites/orch/cephadm/smoke-small/start.yaml
@@ -2,6 +2,9 @@ overrides:
   ceph:
     log-only-match:
       - CEPHADM_
+    log-ignorelist:
+      - CEPHADM_AGENT_DOWN
+      - CEPHADM_FAILED_DAEMON
 tasks:
 - cephadm:
     conf:

diff --git a/qa/suites/orch/cephadm/smoke/start.yaml b/qa/suites/orch/cephadm/smoke/start.yaml
index 52bac2488379eaf65a9a2d4ae1d890714959a993..9c413a61d40a0dd9f7aa943fc5f22c9cf0424752 100644 (file)
--- a/qa/suites/orch/cephadm/smoke/start.yaml
+++ b/qa/suites/orch/cephadm/smoke/start.yaml
@@ -5,6 +5,9 @@ overrides:
       - mons down
       - mon down
       - out of quorum
+      - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
+      - CEPHADM_AGENT_DOWN
     log-only-match:
       - CEPHADM_
 tasks:

diff --git a/qa/suites/orch/cephadm/thrash/1-start.yaml b/qa/suites/orch/cephadm/thrash/1-start.yaml
index 0967bc2efc9cf17c43ca15511cbc7bc0933ff15b..73b02347331857cabeccd73627c78f0424685b82 100644 (file)
--- a/qa/suites/orch/cephadm/thrash/1-start.yaml
+++ b/qa/suites/orch/cephadm/thrash/1-start.yaml
@@ -1,7 +1,8 @@
 overrides:
   ceph:
     log-ignorelist:
-    - CEPHADM_STRAY_DAEMON
+      - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
     log-only-match:
       - CEPHADM_
 tasks:

diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
index 5da510cb56349d5f105f9c81ab6172ec98a273e9..0e5204c115d4adb291231f00a2cebeb8500b9b87 100644 (file)
--- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
+++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     log-ignorelist:
       - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
+      - CEPHADM_AGENT_DOWN
     log-only-match:
       - CEPHADM_
 tasks:

diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
index c78d3b4c2935bb213d6379c986886439841895e1..0080d3bf7306fcf11465a01eef0488f05cdf1839 100644 (file)
--- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
+++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     log-ignorelist:
       - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
+      - CEPHADM_AGENT_DOWN
     log-only-match:
       - CEPHADM_
 tasks:

diff --git a/qa/suites/orch/cephadm/workunits/task/test_extra_daemon_features.yaml b/qa/suites/orch/cephadm/workunits/task/test_extra_daemon_features.yaml
index 63ff535f779a95ba03969e81632679e406cd7228..6100c4d3b848665c44ddd7cebaf72661f351276e 100644 (file)
--- a/qa/suites/orch/cephadm/workunits/task/test_extra_daemon_features.yaml
+++ b/qa/suites/orch/cephadm/workunits/task/test_extra_daemon_features.yaml
@@ -11,6 +11,8 @@ overrides:
   ceph:
     log-only-match:
       - CEPHADM_
+    log-ignorelist:
+      - CEPHADM_FAILED_DAEMON
 tasks:
 - install:
 - cephadm:

diff --git a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml
index 558cedbd74e27224255af9046797e02d9f09221e..1667449b990a2f97fbe894b78781cd681f87929d 100644 (file)
--- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml
+++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml
@@ -5,6 +5,9 @@ overrides:
       - mons down
       - mon down
       - out of quorum
+      - CEPHADM_STRAY_HOST
+      - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
     log-only-match:
       - CEPHADM_
 roles:

diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
index 7118cc633d071f08da480e065aa712a58986483b..74acebd7037774e7d7892a84efae6bfc4dd5839e 100644 (file)
--- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
@@ -10,6 +10,8 @@ overrides:
   ceph:
     log-only-match:
       - CEPHADM_
+    log-ignorelist:
+      - CEPHADM_FAILED_DAEMON
 tasks:
 - install:
 - cephadm:

diff --git a/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml b/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml
index 081d6fb964120708e255e67ae9ccf114717790e7..89733dabeadd112442b937669dbf655443916fb3 100644 (file)
--- a/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml
+++ b/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml
@@ -5,6 +5,8 @@ overrides:
       - mons down
       - mon down
       - out of quorum
+      - CEPHADM_STRAY_DAEMON
+      - CEPHADM_FAILED_DAEMON
     log-only-match:
       - CEPHADM_
 roles:

diff --git a/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml b/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml
index 8fa7f255ad0bd3ab261cc8ceb8dfedc7921a53ae..ab093768285387e64b2bac55289406a23ea6fad0 100644 (file)
--- a/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml
+++ b/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml
@@ -6,6 +6,7 @@ overrides:
       - mon down
       - mons down
       - out of quorum
+      - CEPHADM_FAILED_DAEMON
     log-only-match:
       - CEPHADM_
 roles: