From 53b462764c6fe11282b6cdb21131c176c1ed2350 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 27 Jun 2024 10:12:10 +0200 Subject: [PATCH] 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 --- qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml | 1 + qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml | 4 ++++ qa/suites/orch/cephadm/osds/1-start.yaml | 1 + qa/suites/orch/cephadm/smoke-roleless/1-start.yaml | 3 +++ qa/suites/orch/cephadm/smoke-small/start.yaml | 3 +++ qa/suites/orch/cephadm/smoke/start.yaml | 2 ++ qa/suites/orch/cephadm/thrash/1-start.yaml | 3 ++- qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml | 2 ++ qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 2 ++ .../cephadm/workunits/task/test_extra_daemon_features.yaml | 2 ++ qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml | 1 + .../task/test_iscsi_container/test_iscsi_container.yaml | 2 ++ .../cephadm/workunits/task/test_monitoring_stack_basic.yaml | 1 + .../cephadm/workunits/task/test_set_mon_crush_locations.yaml | 1 + 14 files changed, 27 insertions(+), 1 deletion(-) diff --git a/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml b/qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml index fb407420562..1556e312e31 100644 --- 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 7559885b971..c48b61198d7 100644 --- 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 7f2e4b2feb7..90f49cc2adf 100644 --- 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 350f76c5dae..418e6848073 100644 --- 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 f736c7bf093..7d89f23d3f8 100644 --- 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 261417ba065..9c413a61d40 100644 --- a/qa/suites/orch/cephadm/smoke/start.yaml +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -6,6 +6,8 @@ overrides: - 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 0967bc2efc9..73b02347331 100644 --- 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 5da510cb563..0e5204c115d 100644 --- 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 c78d3b4c293..0080d3bf730 100644 --- 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 63ff535f779..6100c4d3b84 100644 --- 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 a19fb1741ff..1667449b990 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml @@ -7,6 +7,7 @@ overrides: - 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 7118cc633d0..74acebd7037 100644 --- 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 579b0297c48..89733dabead 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml @@ -6,6 +6,7 @@ overrides: - 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 8fa7f255ad0..ab093768285 100644 --- 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: -- 2.39.5