Skip to content

Commit 676862e

Browse files
committed
Merge PR ceph#55601 into main
* refs/pull/55601/head: qa: test fuse/kclient for mds upgrade seq qa: ignore OSD_DOWN during cephadm upgrades qa: ignore warning "Replacing daemon" qa: ignore MDS_INSUFFICIENT_STANDBY qa: remove ignorelist error parenthesis mds: update comment on kclient decoding of MDSMap qa: do upgrades from quincy and older reef minor releases mds: reverse MDSMap encoding of max_xattr_size/bal_rank_mask Reviewed-by: Venky Shankar <[email protected]>
2 parents b985f57 + 182f4c0 commit 676862e

File tree

9 files changed

+116
-13
lines changed

9 files changed

+116
-13
lines changed
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
overrides:
22
ceph:
33
log-ignorelist:
4+
- FS_DEGRADED
5+
- FS_INLINE_DATA_DEPRECATED
6+
- FS_WITH_FAILED_MDS
7+
- MDS_ALL_DOWN
8+
- MDS_DAMAGE
9+
- MDS_DEGRADED
10+
- MDS_FAILED
11+
- MDS_INSUFFICIENT_STANDBY
12+
- MDS_UP_LESS_THAN_MAX
13+
- POOL_APP_NOT_ENABLED
414
- overall HEALTH_
5-
- \(FS_DEGRADED\)
6-
- \(MDS_FAILED\)
7-
- \(MDS_DEGRADED\)
8-
- \(FS_WITH_FAILED_MDS\)
9-
- \(MDS_DAMAGE\)
10-
- \(MDS_ALL_DOWN\)
11-
- \(MDS_UP_LESS_THAN_MAX\)
12-
- \(FS_INLINE_DATA_DEPRECATED\)
13-
- \(POOL_APP_NOT_ENABLED\)
15+
- Replacing daemon
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
overrides:
2+
ceph:
3+
log-ignorelist:
4+
- OSD_DOWN

qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/$

Whitespace-only changes.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
meta:
2+
- desc: |
3+
setup ceph/reef
4+
5+
tasks:
6+
- install:
7+
branch: reef
8+
exclude_packages:
9+
- ceph-volume
10+
- print: "**** done install task..."
11+
- cephadm:
12+
image: quay.ceph.io/ceph-ci/ceph:reef
13+
roleless: true
14+
compiled_cephadm_branch: reef
15+
conf:
16+
osd:
17+
#set config option for which cls modules are allowed to be loaded / used
18+
osd_class_load_list: "*"
19+
osd_class_default_list: "*"
20+
- print: "**** done end installing reef cephadm ..."
21+
- cephadm.shell:
22+
host.a:
23+
- ceph config set mgr mgr/cephadm/use_repo_digest true --force
24+
- print: "**** done cephadm.shell ceph config set mgr..."
25+
- cephadm.shell:
26+
host.a:
27+
- ceph orch status
28+
- ceph orch ps
29+
- ceph orch ls
30+
- ceph orch host ls
31+
- ceph orch device ls
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
meta:
2+
- desc: |
3+
setup ceph/v18.2.0
4+
5+
tasks:
6+
- install:
7+
tag: v18.2.0
8+
exclude_packages:
9+
- ceph-volume
10+
- print: "**** done install task..."
11+
- cephadm:
12+
image: quay.io/ceph/ceph:v18.2.0
13+
roleless: true
14+
compiled_cephadm_branch: reef
15+
conf:
16+
osd:
17+
#set config option for which cls modules are allowed to be loaded / used
18+
osd_class_load_list: "*"
19+
osd_class_default_list: "*"
20+
- print: "**** done end installing v18.2.0 cephadm ..."
21+
- cephadm.shell:
22+
host.a:
23+
- ceph config set mgr mgr/cephadm/use_repo_digest true --force
24+
- print: "**** done cephadm.shell ceph config set mgr..."
25+
- cephadm.shell:
26+
host.a:
27+
- ceph orch status
28+
- ceph orch ps
29+
- ceph orch ls
30+
- ceph orch host ls
31+
- ceph orch device ls
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
meta:
2+
- desc: |
3+
setup ceph/v18.2.1
4+
5+
tasks:
6+
- install:
7+
tag: v18.2.1
8+
exclude_packages:
9+
- ceph-volume
10+
- print: "**** done install task..."
11+
- cephadm:
12+
image: quay.io/ceph/ceph:v18.2.1
13+
roleless: true
14+
compiled_cephadm_branch: reef
15+
conf:
16+
osd:
17+
#set config option for which cls modules are allowed to be loaded / used
18+
osd_class_load_list: "*"
19+
osd_class_default_list: "*"
20+
- print: "**** done end installing v18.2.1 cephadm ..."
21+
- cephadm.shell:
22+
host.a:
23+
- ceph config set mgr mgr/cephadm/use_repo_digest true --force
24+
- print: "**** done cephadm.shell ceph config set mgr..."
25+
- cephadm.shell:
26+
host.a:
27+
- ceph orch status
28+
- ceph orch ps
29+
- ceph orch ls
30+
- ceph orch host ls
31+
- ceph orch device ls
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tasks:
2+
- ceph-fuse:
3+
- print: "**** done client"

qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml renamed to qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client/kclient.yaml

File renamed without changes.

src/mds/MDSMap.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,8 @@ void MDSMap::encode(bufferlist& bl, uint64_t features) const
800800
encode(min_compat_client, bl);
801801
}
802802
encode(required_client_features, bl);
803-
encode(max_xattr_size, bl);
804803
encode(bal_rank_mask, bl);
804+
encode(max_xattr_size, bl);
805805
ENCODE_FINISH(bl);
806806
}
807807

@@ -852,7 +852,8 @@ void MDSMap::decode(bufferlist::const_iterator& p)
852852
decode(cas_pool, p);
853853
}
854854

855-
// kclient ignores everything from here
855+
// kclient skips most of what's below
856+
// see fs/ceph/mdsmap.c for current decoding
856857
__u16 ev = 1;
857858
if (struct_v >= 2)
858859
decode(ev, p);
@@ -949,11 +950,11 @@ void MDSMap::decode(bufferlist::const_iterator& p)
949950
}
950951

951952
if (ev >= 17) {
952-
decode(max_xattr_size, p);
953+
decode(bal_rank_mask, p);
953954
}
954955

955956
if (ev >= 18) {
956-
decode(bal_rank_mask, p);
957+
decode(max_xattr_size, p);
957958
}
958959

959960
/* All MDS since at least v14.0.0 understand INLINE */

0 commit comments

Comments
 (0)