From b4522dd332d40a54b9e0be58bd96aeaa345f8977 Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 8 Apr 2024 15:11:02 -0400 Subject: [PATCH] qa/cephadm: only fail on CEPHADM_ error in logs Rather than failing for any instance of [ERR], [WRN], or [SEC]. The orch/cephadm suite does a lot of stuff that can cause these various warnings to breifly appear. Trying to catch all cases has been difficult and the suite has been red for some time. This patch makes it so it instead only matches log messages that include CEPHADM_ on top of having [ERR], [WRN], or [SEC] as those warnings have been the ones that have actually lead us to cephadm bugs, while the others are pretty much always just noise in these tests. This patch does not apply this to the mds_upgrade_sequence, nfs, or rbd-iscsi sections as those are symlinked from other suites and I didn't want to affect those suites tests directly with this change. Signed-off-by: Adam King --- .../orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml | 4 ++++ .../no-agent-workunits/task/test_cephadm_timeout.yaml | 6 +++++- .../orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml | 4 ++++ .../cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml | 2 ++ qa/suites/orch/cephadm/osds/1-start.yaml | 2 ++ qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml | 4 ++++ qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml | 4 ++++ qa/suites/orch/cephadm/smoke-roleless/1-start.yaml | 2 ++ qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml | 2 ++ qa/suites/orch/cephadm/smoke-small/start.yaml | 4 ++++ qa/suites/orch/cephadm/smoke/start.yaml | 2 ++ qa/suites/orch/cephadm/thrash/1-start.yaml | 4 ++++ qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml | 4 ++++ qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 4 ++++ qa/suites/orch/cephadm/with-work/start.yaml | 4 ++++ .../orch/cephadm/workunits/task/test_ca_signed_key.yaml | 3 +++ .../cephadm/workunits/task/test_extra_daemon_features.yaml | 4 ++++ qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml | 2 ++ .../task/test_iscsi_container/test_iscsi_container.yaml | 4 ++++ .../cephadm/workunits/task/test_monitoring_stack_basic.yaml | 2 ++ .../orch/cephadm/workunits/task/test_rgw_multisite.yaml | 2 ++ .../workunits/task/test_set_mon_crush_locations.yaml | 2 ++ 22 files changed, 70 insertions(+), 1 deletion(-) diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml index a805c032cdd..4fc3b5a6dfd 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - cephadm: roleless: true diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml index 24b53d02912..96763df3088 100644 --- a/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml +++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml @@ -4,10 +4,14 @@ roles: - mgr.a - osd.0 - client.0 +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - install: - cephadm: - workunit: clients: client.0: - - cephadm/test_cephadm_timeout.py \ No newline at end of file + - cephadm/test_cephadm_timeout.py diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml index ec65fb116f7..db7abca0083 100644 --- a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml +++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml @@ -6,6 +6,10 @@ roles: - mon.a - mgr.a - client.0 +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - install: - cephadm: diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml index c85711420a3..450b4154c51 100644 --- a/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml +++ b/qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml @@ -2,6 +2,8 @@ overrides: ceph: log-ignorelist: - MON_DOWN + log-only-match: + - CEPHADM_ roles: - - host.a - osd.0 diff --git a/qa/suites/orch/cephadm/osds/1-start.yaml b/qa/suites/orch/cephadm/osds/1-start.yaml index 4331d7c6694..03913f60205 100644 --- a/qa/suites/orch/cephadm/osds/1-start.yaml +++ b/qa/suites/orch/cephadm/osds/1-start.yaml @@ -23,3 +23,5 @@ overrides: conf: osd: osd shutdown pgref assert: true + log-only-match: + - CEPHADM_ diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml index a64591ce8f8..3648f39483d 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml @@ -10,6 +10,10 @@ roles: # Reserve a host for acting as a test client - - host.b - cephadm.exclude +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: # TODO: (jjm) I don't think `install` is necessary for this file. Remove? - install: diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml index 7662c9d6a46..541d5ac1fa7 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml @@ -9,6 +9,10 @@ roles: # Reserve a host for acting as a domain controller - - host.b - cephadm.exclude +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - cephadm.deploy_samba_ad_dc: role: host.b diff --git a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml index 018356f8fe1..350f76c5dae 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml @@ -22,3 +22,5 @@ overrides: conf: osd: osd shutdown pgref assert: true + log-only-match: + - CEPHADM_ diff --git a/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml b/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml index ca6019c66cf..678fb8d8f28 100644 --- a/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml +++ b/qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml @@ -25,3 +25,5 @@ overrides: conf: osd: osd shutdown pgref assert: true + log-only-match: + - CEPHADM_ diff --git a/qa/suites/orch/cephadm/smoke-small/start.yaml b/qa/suites/orch/cephadm/smoke-small/start.yaml index 77f493ca1b9..f736c7bf093 100644 --- a/qa/suites/orch/cephadm/smoke-small/start.yaml +++ b/qa/suites/orch/cephadm/smoke-small/start.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - cephadm: conf: diff --git a/qa/suites/orch/cephadm/smoke/start.yaml b/qa/suites/orch/cephadm/smoke/start.yaml index 2f60c20c726..52bac248837 100644 --- a/qa/suites/orch/cephadm/smoke/start.yaml +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -5,6 +5,8 @@ overrides: - mons down - mon down - out of quorum + 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 a1b89e44db8..66f9e185393 100644 --- a/qa/suites/orch/cephadm/thrash/1-start.yaml +++ b/qa/suites/orch/cephadm/thrash/1-start.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + 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 f10a49beafe..ac93a456cb6 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + 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 280714e4e58..f1fd9f039bb 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - cephadm.shell: env: [sha1] diff --git a/qa/suites/orch/cephadm/with-work/start.yaml b/qa/suites/orch/cephadm/with-work/start.yaml index a1b89e44db8..66f9e185393 100644 --- a/qa/suites/orch/cephadm/with-work/start.yaml +++ b/qa/suites/orch/cephadm/with-work/start.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + log-only-match: + - CEPHADM_ tasks: - install: - cephadm: diff --git a/qa/suites/orch/cephadm/workunits/task/test_ca_signed_key.yaml b/qa/suites/orch/cephadm/workunits/task/test_ca_signed_key.yaml index 7bf51f719c1..e646d248289 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_ca_signed_key.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_ca_signed_key.yaml @@ -12,6 +12,9 @@ roles: overrides: cephadm: use-ca-signed-key: True + ceph: + log-only-match: + - CEPHADM_ tasks: - install: - cephadm: 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 0e825cd1100..63ff535f779 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,10 @@ roles: - mon.b - mgr.b - osd.1 +overrides: + ceph: + log-only-match: + - CEPHADM_ 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 20e0b96d7ab..558cedbd74e 100644 --- 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,8 @@ overrides: - mons down - mon down - out of quorum + 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 19d302c87de..7118cc633d0 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,10 @@ roles: - mon.a - mgr.a - client.0 +overrides: + ceph: + log-only-match: + - CEPHADM_ 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 f12aad61bfc..081d6fb9641 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 @@ -5,6 +5,8 @@ overrides: - mons down - mon down - out of quorum + log-only-match: + - CEPHADM_ roles: - - host.a - mon.a diff --git a/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml b/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml index 35b70ed39ad..b785fbd3a09 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml @@ -5,6 +5,8 @@ overrides: - mons down - mon down - out of quorum + log-only-match: + - CEPHADM_ roles: - - host.a - mon.a 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 f9013a33c83..8fa7f255ad0 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,8 @@ overrides: - mon down - mons down - out of quorum + log-only-match: + - CEPHADM_ roles: - - host.a - osd.0 -- 2.39.5