From fb594328e92d0064c5af2376e21ef868fcc09da4 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 4 Mar 2019 09:06:16 -0800 Subject: [PATCH] mds: fix encoded version of mds_info_t Introduced-by: 1f5892f82046ebaac3b66dbd8e686825ebb1775c Signed-off-by: Patrick Donnelly --- src/mds/MDSMap.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index 889d35b7f1e5..4b213cf70438 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -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); -- 2.47.3