RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26744 into master

Browse Source 
* refs/pull/26744/head:
	mds: fix encoded version of mds_info_t

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-03-04 17:13:30 -06:00
commit db6201acaa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mds/MDSMap.cc
View File

@ -531,7 +531,9 @@ void MDSMap::mds_info_t::encode_versioned(bufferlist& bl, uint64_t features) con
encode(mds_features, bl);
encode(FS_CLUSTER_ID_NONE, bl); /* standby_for_fscid */
encode(false, bl);
encode(flags, bl);
if (v >= 9) {
encode(flags, bl);
}
ENCODE_FINISH(bl);
}
@ -555,7 +557,7 @@ void MDSMap::mds_info_t::encode_unversioned(bufferlist& bl) const
void MDSMap::mds_info_t::decode(bufferlist::const_iterator& bl)
{
DECODE_START_LEGACY_COMPAT_LEN(8, 4, 4, bl);
DECODE_START_LEGACY_COMPAT_LEN(9, 4, 4, bl);
decode(global_id, bl);
decode(name, bl);
decode(rank, bl);
@ -584,7 +586,7 @@ void MDSMap::mds_info_t::decode(bufferlist::const_iterator& bl)
bool standby_replay;
decode(standby_replay, bl);
}
if (struct_v >= 8) {
if (struct_v >= 9) {
decode(flags, bl);
}
DECODE_FINISH(bl);