Skip to content

Commit 80c29ae

Browse files
authored
Merge pull request ceph#59855 from NitzanMordhai/wip-nitzan-expected-failure-wait-osd-down
qa/tasks/ceph: wait the osds down before start check the logs Reviewed-by: Radoslaw Zarzynski <[email protected]>
2 parents 0d0bbbe + ad8e622 commit 80c29ae

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

qa/suites/upgrade/quincy-x/filestore-remove-check/0-cluster/start.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,20 @@ overrides:
1919
- \(MGR_DOWN\)
2020
- slow request
2121
- \(MON_MSGR2_NOT_ENABLED\)
22+
- \(OSD_DOWN\)
23+
- \(OSD_HOST_DOWN\)
24+
- \(POOL_APP_NOT_ENABLED\)
25+
- OSD_DOWN
26+
- mons down
27+
- mon down
28+
- MON_DOWN
29+
- out of quorum
30+
- PG_DEGRADED
31+
- Reduced data availability
32+
- Degraded data redundancy
33+
- OSDMAP_FLAGS
34+
- OSD_ROOT_DOWN
35+
2236
conf:
2337
global:
2438
enable experimental unrecoverable data corrupting features: "*"
@@ -30,4 +44,3 @@ roles:
3044
- mgr.x
3145
- osd.0
3246
- osd.1
33-
- osd.2

qa/suites/upgrade/quincy-x/filestore-remove-check/1-ceph-install/quincy.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ tasks:
1818
mon:
1919
mon_warn_on_insecure_global_id_reclaim: false
2020
mon_warn_on_insecure_global_id_reclaim_allowed: false
21-
log-ignorelist:
22-
- Not found or unloadable
23-
- evicting unresponsive client
2421
- exec:
2522
osd.0:
2623
- ceph osd require-osd-release quincy
@@ -30,14 +27,3 @@ overrides:
3027
conf:
3128
mon:
3229
mon warn on osd down out interval zero: false
33-
log-ignorelist:
34-
- \(POOL_APP_NOT_ENABLED\)
35-
- OSD_DOWN
36-
- mons down
37-
- mon down
38-
- MON_DOWN
39-
- out of quorum
40-
- PG_DEGRADED
41-
- Reduced data availability
42-
- Degraded data redundancy
43-
- OSDMAP_FLAGS

qa/suites/upgrade/quincy-x/filestore-remove-check/2 - upgrade.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ meta:
33
install upgrade ceph/-x on cluster
44
restart : mons, osd.*
55
tasks:
6+
- print: "**** start install.upgrade of nodes"
67
- install.upgrade:
7-
mon.a:
8-
- exec:
9-
osd.0:
10-
- ceph osd require-osd-release quincy
8+
all:
119
- print: "**** done install.upgrade of nodes"
10+
- print: "**** start ceph.restart of all osds"
1211
- ceph.restart:
13-
daemons: [mon.a,mgr.x,osd.0,osd.1,osd.2]
12+
daemons: [osd.0,osd.1,osd.2]
1413
mon-health-to-clog: false
1514
wait-for-healthy: false
1615
wait-for-osds-up: false

0 commit comments

Comments
 (0)