Skip to content

Commit b4522dd

Browse files
committed
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 <[email protected]>
1 parent 443c591 commit b4522dd

File tree

22 files changed

+70
-1
lines changed

22 files changed

+70
-1
lines changed

qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/17.2.0.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
overrides:
2+
ceph:
3+
log-only-match:
4+
- CEPHADM_
15
tasks:
26
- cephadm:
37
roleless: true

qa/suites/orch/cephadm/no-agent-workunits/task/test_cephadm_timeout.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ roles:
44
- mgr.a
55
- osd.0
66
- client.0
7+
overrides:
8+
ceph:
9+
log-only-match:
10+
- CEPHADM_
711
tasks:
812
- install:
913
- cephadm:
1014
- workunit:
1115
clients:
1216
client.0:
13-
- cephadm/test_cephadm_timeout.py
17+
- cephadm/test_cephadm_timeout.py

qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ roles:
66
- mon.a
77
- mgr.a
88
- client.0
9+
overrides:
10+
ceph:
11+
log-only-match:
12+
- CEPHADM_
913
tasks:
1014
- install:
1115
- cephadm:

qa/suites/orch/cephadm/no-agent-workunits/task/test_orch_cli_mon.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ overrides:
22
ceph:
33
log-ignorelist:
44
- MON_DOWN
5+
log-only-match:
6+
- CEPHADM_
57
roles:
68
- - host.a
79
- osd.0

qa/suites/orch/cephadm/osds/1-start.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ overrides:
2323
conf:
2424
osd:
2525
osd shutdown pgref assert: true
26+
log-only-match:
27+
- CEPHADM_

qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ roles:
1010
# Reserve a host for acting as a test client
1111
- - host.b
1212
- cephadm.exclude
13+
overrides:
14+
ceph:
15+
log-only-match:
16+
- CEPHADM_
1317
tasks:
1418
# TODO: (jjm) I don't think `install` is necessary for this file. Remove?
1519
- install:

qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ roles:
99
# Reserve a host for acting as a domain controller
1010
- - host.b
1111
- cephadm.exclude
12+
overrides:
13+
ceph:
14+
log-only-match:
15+
- CEPHADM_
1216
tasks:
1317
- cephadm.deploy_samba_ad_dc:
1418
role: host.b

qa/suites/orch/cephadm/smoke-roleless/1-start.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ overrides:
2222
conf:
2323
osd:
2424
osd shutdown pgref assert: true
25+
log-only-match:
26+
- CEPHADM_

qa/suites/orch/cephadm/smoke-singlehost/1-start.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ overrides:
2525
conf:
2626
osd:
2727
osd shutdown pgref assert: true
28+
log-only-match:
29+
- CEPHADM_

qa/suites/orch/cephadm/smoke-small/start.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
overrides:
2+
ceph:
3+
log-only-match:
4+
- CEPHADM_
15
tasks:
26
- cephadm:
37
conf:

0 commit comments

Comments
 (0)