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 <adking@redhat.com>
(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

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 a805c032cdd7b2dd09e802548f9d998f42a06ca1..4fc3b5a6dfdcc12080008f2f4ebc1a2a3724ca10 100644 (file)
--- 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 24b53d0291232c3f74c273d017a603e45b970796..96763df308890d04ae74008e337b67ad4b8df59a 100644 (file)
--- 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 ec65fb116f718cef1039b392ccecc32624013b3c..db7abca008349c2f091d7f43327c32a2ede67c0b 100644 (file)
--- 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 c85711420a3fe018326a49694fcfbc94b5a46949..450b4154c516850a2ce163de7c4c73ba7ed6b0b0 100644 (file)
--- 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 4331d7c669493c09348223d0806c7b8370e638d1..03913f6020542f959a83589671ada3f706bbae53 100644 (file)
--- 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 018356f8fe1baeb0730321d2c467075852805d19..350f76c5daea95835dec34de82e38396eee43e1f 100644 (file)
--- 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 ca6019c66cfe5b007bef36fa4c9da6d32dbf6045..678fb8d8f28a9ac18d2125b817beb8ee7a7048f2 100644 (file)
--- 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 77f493ca1b9f7f627d61b5999737b84c96a67c18..f736c7bf09395a73a5e0191a494acaa344629bfa 100644 (file)
--- 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 8cec0860a2f7499183ee2d65ba5ac3fa032028bd..aa446161ae6eb722a11f923cff9e71a164d7e4fc 100644 (file)
--- 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 a1b89e44db88e634946cc554b1651e27aeb516e9..66f9e18539340e48579600b1129f6cba9d1f6ee1 100644 (file)
--- 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 f10a49beafe7cf3d1aaa0ccc7e93dc97deced499..ac93a456cb6b31aaf6aeae2195e7fd041e459b86 100644 (file)
--- 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 280714e4e587c61cf80f15f33d832dcd3ec76d4e..f1fd9f039bb8fbbb2883007556f5d5af66fed0e7 100644 (file)
--- 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 a1b89e44db88e634946cc554b1651e27aeb516e9..66f9e18539340e48579600b1129f6cba9d1f6ee1 100644 (file)
--- 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 7bf51f719c1d3d10f1db14752fd4d2d0cc2a1ac0..e646d2482893465fe11ee3b8719de1d15e0d5b65 100644 (file)
--- 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 0e825cd11009f3e1c1afd41a2650bf6379778390..63ff535f779a95ba03969e81632679e406cd7228 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
@@ -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 74f72c057dedfa89ee43dce20f21e5721664c595..24642bb519865649a5d11b59d5e9f43873427b36 100644 (file)
--- 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 19d302c87deb734522ebdeaacb681fef308a6aea..7118cc633d071f08da480e065aa712a58986483b 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
@@ -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 b7f00481963d8d9d7a41acedf27dd9256629751d..9968c65c5698ba9bd820820bff66a4dac7e334ce 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
@@ -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 dc982364b319a170ffd555e8c198b49231d9c3b6..3c117b4255283f2b59e39f4f01729d3a0e2a49e8 100644 (file)
--- 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 7379f88ee984d58c4b2a7b8adea8f1d491ae1333..b35385ac7a476ab559f1ab3e4ac42cb7ceaf143e 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
@@ -3,6 +3,8 @@ overrides:
     log-ignorelist:
       - MON_DOWN
       - POOL_APP_NOT_ENABLED
+    log-only-match:
+      - CEPHADM_
 roles:
 - - host.a
   - osd.0