Skip to content

Commit 96c7a23

Browse files
authored
Merge pull request ceph#58344 from guits/fix-log-errors
qa: fix log errors for cephadm tests
2 parents 1a7902c + 53b4627 commit 96c7a23

File tree

14 files changed

+27
-1
lines changed

14 files changed

+27
-1
lines changed

qa/suites/fs/nfs/overrides/ignore_mgr_down.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ overrides:
77
ceph:
88
log-ignorelist:
99
- MGR_DOWN
10+
- CEPHADM_FAILED_DAEMON

qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.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-ignorelist:
4+
- CEPHADM_REFRESH_FAILED
15
tasks:
26
- vip.exec:
37
host.a:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ overrides:
2222
ceph:
2323
log-ignorelist:
2424
- OSD_DOWN
25+
- CEPHADM_FAILED_DAEMON
2526
conf:
2627
osd:
2728
osd shutdown pgref assert: true

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ overrides:
2424
osd shutdown pgref assert: true
2525
log-only-match:
2626
- CEPHADM_
27+
log-ignorelist:
28+
- CEPHADM_DAEMON_PLACE_FAIL
29+
- CEPHADM_FAILED_DAEMON

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ overrides:
22
ceph:
33
log-only-match:
44
- CEPHADM_
5+
log-ignorelist:
6+
- CEPHADM_AGENT_DOWN
7+
- CEPHADM_FAILED_DAEMON
58
tasks:
69
- cephadm:
710
conf:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ overrides:
66
- mon down
77
- out of quorum
88
- CEPHADM_STRAY_DAEMON
9+
- CEPHADM_FAILED_DAEMON
10+
- CEPHADM_AGENT_DOWN
911
log-only-match:
1012
- CEPHADM_
1113
tasks:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
overrides:
22
ceph:
33
log-ignorelist:
4-
- CEPHADM_STRAY_DAEMON
4+
- CEPHADM_STRAY_DAEMON
5+
- CEPHADM_FAILED_DAEMON
56
log-only-match:
67
- CEPHADM_
78
tasks:

qa/suites/orch/cephadm/upgrade/3-upgrade/simple.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
- CEPHADM_STRAY_DAEMON
5+
- CEPHADM_FAILED_DAEMON
6+
- CEPHADM_AGENT_DOWN
57
log-only-match:
68
- CEPHADM_
79
tasks:

qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.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
- CEPHADM_STRAY_DAEMON
5+
- CEPHADM_FAILED_DAEMON
6+
- CEPHADM_AGENT_DOWN
57
log-only-match:
68
- CEPHADM_
79
tasks:

qa/suites/orch/cephadm/workunits/task/test_extra_daemon_features.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ overrides:
1111
ceph:
1212
log-only-match:
1313
- CEPHADM_
14+
log-ignorelist:
15+
- CEPHADM_FAILED_DAEMON
1416
tasks:
1517
- install:
1618
- cephadm:

0 commit comments

Comments
 (0)