update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / messages / MMDSMap.h

diff --git a/ceph/src/messages/MMDSMap.h b/ceph/src/messages/MMDSMap.h
index 4fd9cc797dd4e75572a46942cc9ff8cebb6731a8..726cfac52ef0a7568f8d0578f7054f72d78d27c2 100644 (file)
--- a/ceph/src/messages/MMDSMap.h
+++ b/ceph/src/messages/MMDSMap.h
@@ -20,55 +20,59 @@
 #include "mds/MDSMap.h"
 #include "include/ceph_features.h"
 
-class MMDSMap : public Message {
-  static const int HEAD_VERSION = 1;
-  static const int COMPAT_VERSION = 1;
+class MMDSMap : public MessageInstance<MMDSMap> {
+public:
+  friend factory;
+private:
+  static constexpr int HEAD_VERSION = 1;
+  static constexpr int COMPAT_VERSION = 1;
 public:
-
   uuid_d fsid;
-  epoch_t epoch;
+  epoch_t epoch = 0;
   bufferlist encoded;
 
   version_t get_epoch() const { return epoch; }
-  bufferlist& get_encoded() { return encoded; }
+  const bufferlist& get_encoded() const { return encoded; }
 
+protected:
   MMDSMap() : 
-    Message(CEPH_MSG_MDS_MAP, HEAD_VERSION, COMPAT_VERSION) {}
-  MMDSMap(const uuid_d &f, const MDSMap *mm) :
-    Message(CEPH_MSG_MDS_MAP, HEAD_VERSION, COMPAT_VERSION),
+    MessageInstance(CEPH_MSG_MDS_MAP, HEAD_VERSION, COMPAT_VERSION) {}
+  MMDSMap(const uuid_d &f, const MDSMap &mm) :
+    MessageInstance(CEPH_MSG_MDS_MAP, HEAD_VERSION, COMPAT_VERSION),
     fsid(f) {
-    epoch = mm->get_epoch();
-    mm->encode(encoded, -1);  // we will reencode with fewer features as necessary
+    epoch = mm.get_epoch();
+    mm.encode(encoded, -1);  // we will reencode with fewer features as necessary
   }
-private:
   ~MMDSMap() override {}
 
 public:
-  const char *get_type_name() const override { return "mdsmap"; }
+  std::string_view get_type_name() const override { return "mdsmap"; }
   void print(ostream& out) const override {
     out << "mdsmap(e " << epoch << ")";
   }
 
   // marshalling
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    ::decode(fsid, p);
-    ::decode(epoch, p);
-    ::decode(encoded, p);
+    auto p = payload.cbegin();
+    decode(fsid, p);
+    decode(epoch, p);
+    decode(encoded, p);
   }
   void encode_payload(uint64_t features) override {
-    ::encode(fsid, payload);
-    ::encode(epoch, payload);
+    using ceph::encode;
+    encode(fsid, payload);
+    encode(epoch, payload);
     if ((features & CEPH_FEATURE_PGID64) == 0 ||
        (features & CEPH_FEATURE_MDSENC) == 0 ||
-       (features & CEPH_FEATURE_MSG_ADDR2) == 0) {
+       (features & CEPH_FEATURE_MSG_ADDR2) == 0 ||
+       !HAVE_FEATURE(features, SERVER_NAUTILUS)) {
       // reencode for old clients.
       MDSMap m;
       m.decode(encoded);
       encoded.clear();
       m.encode(encoded, features);
     }
-    ::encode(encoded, payload);
+    encode(encoded, payload);
   }
 };