Skip to content

Commit 5813414

Browse files
Matan-BMatan-B
authored
Merge pull request ceph#64715 from Matan-B/wip-matanb-crimson-qa-clusters
qa/suites/crimson-rados: Enable Seastore Thrash tests (w/ Recovery) Reviewed-by: Samuel Just <[email protected]> Reviewed-by: Xuehan Xu <[email protected]>
2 parents 77c93e6 + a94b339 commit 5813414

File tree

105 files changed

+111
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+111
-189
lines changed

qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml renamed to qa/clusters/crimson/crimson-fixed-1.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@ overrides:
1010
conf:
1111
osd:
1212
osd shutdown pgref assert: true
13-
crimson bluestore cpu set: 6-7
14-
osd.0:
15-
crimson cpu set: 0-1
16-
osd.1:
17-
crimson cpu set: 2-3
18-
osd.2:
19-
crimson cpu set: 4-5
13+
crimson cpu num: 2
2014
global:
2115
ms cluster mode: crc
2216
ms service mode: crc

qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml renamed to qa/clusters/crimson/crimson-fixed-2.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,7 @@ overrides:
66
conf:
77
osd:
88
osd shutdown pgref assert: true
9-
crimson bluestore cpu set: 6-7
10-
osd.0:
11-
crimson cpu set: 0-2
12-
osd.1:
13-
crimson cpu set: 3-5
14-
osd.2:
15-
crimson cpu set: 0-2
16-
osd.3:
17-
crimson cpu set: 3-5
9+
crimson cpu num: 3
1810
global:
1911
ms cluster mode: crc
2012
ms service mode: crc

‎qa/clusters/crimson/crimson-fixed-3.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
roles:
2+
- [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2, osd.3]
3+
- [mon.b, mgr.y, osd.4, osd.5, osd.6, osd.7]
4+
- [client.0]
5+
overrides:
6+
ceph:
7+
conf:
8+
osd:
9+
osd shutdown pgref assert: true
10+
crimson cpu num: 3
11+
global:
12+
ms cluster mode: crc
13+
ms service mode: crc
14+
ms client mode: crc
15+
ms mon service mode: crc
16+
ms mon cluster mode: crc
17+
ms mon client mode: crc

‎qa/clusters/crimson/crimson-fixed-4.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
roles:
2+
- [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
3+
- [mon.b, osd.1, osd.5, osd.9, osd.13]
4+
- [mon.c, osd.2, osd.6, osd.10, osd.14]
5+
- [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
6+
overrides:
7+
ceph:
8+
conf:
9+
osd:
10+
osd shutdown pgref assert: true
11+
crimson cpu num: 3
12+
global:
13+
ms cluster mode: crc
14+
ms service mode: crc
15+
ms client mode: crc
16+
ms mon service mode: crc
17+
ms mon cluster mode: crc
18+
ms mon client mode: crc

qa/config/crimson_bluestore.yaml renamed to qa/objectstore/crimson/crimson_bluestore.yaml

File renamed without changes.

qa/config/crimson_seastore_rbm.yaml renamed to qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm.yaml

File renamed without changes.

‎qa/objectstore/crimson/seastore/rbm$/crimson_seastore_rbm_2q.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
overrides:
2+
ceph:
3+
conf:
4+
osd:
5+
# crimson's osd objectstore option
6+
osd objectstore: seastore
7+
seastore cachepin type: 2Q
8+
seastore main device type: RANDOM_BLOCK_SSD
9+
debug seastore: 20
10+
debug seastore onode: 20
11+
debug seastore odata: 20
12+
debug seastore omap: 20
13+
debug seastore tm: 20
14+
debug seastore t: 20
15+
debug seastore cleaner: 20
16+
debug seastore epm: 20
17+
debug seastore lba: 20
18+
debug seastore fixedkv tree: 20
19+
debug seastore cache: 20
20+
debug seastore journal: 20
21+
debug seastore device: 20
22+
debug seastore backref: 20

qa/config/crimson_seastore_segmented.yaml renamed to qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented.yaml

File renamed without changes.

‎qa/objectstore/crimson/seastore/segmented$/crimson_seastore_segmented_2q.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
overrides:
2+
ceph:
3+
conf:
4+
osd:
5+
# crimson's osd objectstore option
6+
osd objectstore: seastore
7+
seastore cachepin type: 2Q
8+
debug seastore: 20
9+
debug seastore onode: 20
10+
debug seastore odata: 20
11+
debug seastore omap: 20
12+
debug seastore tm: 20
13+
debug seastore t: 20
14+
debug seastore cleaner: 20
15+
debug seastore epm: 20
16+
debug seastore lba: 20
17+
debug seastore fixedkv tree: 20
18+
debug seastore cache: 20
19+
debug seastore journal: 20
20+
debug seastore device: 20
21+
debug seastore backref: 20

‎qa/suites/crimson-rados-experimental/thrash/clusters/crimson-fixed-2.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.qa/clusters/crimson/crimson-fixed-2.yaml

0 commit comments

Comments
 (0)