From f3998b1a08b948e18537fdcdb4bd75cf52f6d7b5 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 (cherry picked from commit b4522dd332d40a54b9e0be58bd96aeaa345f8977) Conflicts: qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml qa/suites/orch/cephadm/smoke/start.yaml qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml --- .../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/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 ++ 20 files changed, 62 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 a805c032cdd7b..4fc3b5a6dfdcc 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 24b53d0291232..96763df308890 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 ec65fb116f718..db7abca008349 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 c85711420a3fe..450b4154c5168 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 4331d7c669493..03913f6020542 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/smoke-roleless/1-start.yaml b/qa/suites/orch/cephadm/smoke-roleless/1-start.yaml index 018356f8fe1ba..350f76c5daea9 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 ca6019c66cfe5..678fb8d8f28a9 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 77f493ca1b9f7..f736c7bf09395 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 8cec0860a2f74..aa446161ae6eb 100644 --- a/qa/suites/orch/cephadm/smoke/start.yaml +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -2,6 +2,8 @@ overrides: ceph: log-ignorelist: - MON_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..66f9e18539340 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 f10a49beafe7c..ac93a456cb6b3 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 280714e4e587c..f1fd9f039bb8f 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 a1b89e44db88e..66f9e18539340 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 7bf51f719c1d3..e646d24828934 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 0e825cd11009f..63ff535f779a9 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 74f72c057dedf..24642bb519865 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml @@ -2,6 +2,8 @@ overrides: ceph: log-ignorelist: - MON_DOWN + 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..7118cc633d071 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 b7f00481963d8..9968c65c5698b 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 @@ -2,6 +2,8 @@ overrides: ceph: log-ignorelist: - MON_DOWN + 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 dc982364b319a..3c117b4255283 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml @@ -2,6 +2,8 @@ overrides: ceph: log-ignorelist: - MON_DOWN + 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 7379f88ee984d..b35385ac7a476 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 @@ -3,6 +3,8 @@ overrides: log-ignorelist: - MON_DOWN - POOL_APP_NOT_ENABLED + log-only-match: + - CEPHADM_ roles: - - host.a - osd.0 -- 2.39.5