From 04c0809e4bc5d6f88373ff0ea8be98e25f0a4693 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 (cherry picked from commit 53b462764c6fe11282b6cdb21131c176c1ed2350) --- qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml | 4 ++++ qa/suites/orch/cephadm/osds/1-start.yaml | 3 +++ qa/suites/orch/cephadm/smoke-roleless/1-start.yaml | 5 +++++ qa/suites/orch/cephadm/smoke-small/start.yaml | 7 +++++++ qa/suites/orch/cephadm/smoke/start.yaml | 12 ++++++++++++ qa/suites/orch/cephadm/thrash/1-start.yaml | 7 +++++++ qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml | 8 ++++++++ .../orch/cephadm/upgrade/3-upgrade/staggered.yaml | 8 ++++++++ .../workunits/task/test_extra_daemon_features.yaml | 6 ++++++ .../orch/cephadm/workunits/task/test_host_drain.yaml | 12 ++++++++++++ .../test_iscsi_container/test_iscsi_container.yaml | 6 ++++++ .../workunits/task/test_set_mon_crush_locations.yaml | 11 +++++++++++ 12 files changed, 89 insertions(+) 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 3a91696590902..318cad723097e 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 4331d7c669493..de1d7bc82abda 100644 --- a/qa/suites/orch/cephadm/osds/1-start.yaml +++ b/qa/suites/orch/cephadm/osds/1-start.yaml @@ -20,6 +20,9 @@ openstack: size: 10 # GB 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 018356f8fe1ba..418e684807384 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml @@ -22,3 +22,8 @@ overrides: conf: osd: 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 77f493ca1b9f7..7d89f23d3f85e 100644 --- a/qa/suites/orch/cephadm/smoke-small/start.yaml +++ b/qa/suites/orch/cephadm/smoke-small/start.yaml @@ -1,3 +1,10 @@ +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 77f493ca1b9f7..9c413a61d40a0 100644 --- a/qa/suites/orch/cephadm/smoke/start.yaml +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -1,3 +1,15 @@ +overrides: + ceph: + log-ignorelist: + - MON_DOWN + - mons down + - mon down + - out of quorum + - CEPHADM_STRAY_DAEMON + - CEPHADM_FAILED_DAEMON + - CEPHADM_AGENT_DOWN + log-only-match: + - CEPHADM_ tasks: - cephadm: conf: diff --git a/qa/suites/orch/cephadm/thrash/1-start.yaml b/qa/suites/orch/cephadm/thrash/1-start.yaml index a1b89e44db88e..73b0234733185 100644 --- a/qa/suites/orch/cephadm/thrash/1-start.yaml +++ b/qa/suites/orch/cephadm/thrash/1-start.yaml @@ -1,3 +1,10 @@ +overrides: + ceph: + log-ignorelist: + - CEPHADM_STRAY_DAEMON + - CEPHADM_FAILED_DAEMON + log-only-match: + - CEPHADM_ tasks: - install: - cephadm: diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml index f10a49beafe7c..0e5204c115d4a 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml @@ -1,3 +1,11 @@ +overrides: + ceph: + log-ignorelist: + - CEPHADM_STRAY_DAEMON + - CEPHADM_FAILED_DAEMON + - CEPHADM_AGENT_DOWN + log-only-match: + - CEPHADM_ tasks: - cephadm.shell: env: [sha1] diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml index 280714e4e587c..0080d3bf7306f 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml @@ -1,3 +1,11 @@ +overrides: + ceph: + log-ignorelist: + - CEPHADM_STRAY_DAEMON + - CEPHADM_FAILED_DAEMON + - CEPHADM_AGENT_DOWN + log-only-match: + - CEPHADM_ tasks: - cephadm.shell: env: [sha1] 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 b5e0ec98f3239..2fc98392645b7 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 @@ -7,6 +7,12 @@ roles: - mon.b - mgr.b - osd.1 +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 c195bc052b7e3..1667449b990a2 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml @@ -1,3 +1,15 @@ +overrides: + ceph: + log-ignorelist: + - MON_DOWN + - mons down + - mon down + - out of quorum + - CEPHADM_STRAY_HOST + - CEPHADM_STRAY_DAEMON + - CEPHADM_FAILED_DAEMON + log-only-match: + - CEPHADM_ roles: - - host.a - mon.a 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 19d302c87deb7..74acebd703777 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 @@ -6,6 +6,12 @@ roles: - mon.a - mgr.a - client.0 +overrides: + ceph: + log-only-match: + - CEPHADM_ + log-ignorelist: + - CEPHADM_FAILED_DAEMON tasks: - install: - cephadm: 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 6d9bd1525d838..ab09376828538 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 @@ -1,3 +1,14 @@ +overrides: + ceph: + log-ignorelist: + - MON_DOWN + - POOL_APP_NOT_ENABLED + - mon down + - mons down + - out of quorum + - CEPHADM_FAILED_DAEMON + log-only-match: + - CEPHADM_ roles: - - host.a - osd.0 -- 2.47.3