update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MMgrOpen.h b/ceph/src/messages/MMgrOpen.h
index 5db75e3f19586bb2be337ef89ec26f34d4945427..754daf7d340abdfe65100c9f390911743bdb71da 100644 (file)
--- a/ceph/src/messages/MMgrOpen.h
+++ b/ceph/src/messages/MMgrOpen.h
@@ -17,10 +17,13 @@
 
 #include "msg/Message.h"
 
-class MMgrOpen : public Message
-{
-  static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+class MMgrOpen : public MessageInstance<MMgrOpen> {
+public:
+  friend factory;
+private:
+
+  static constexpr int HEAD_VERSION = 3;
+  static constexpr int COMPAT_VERSION = 1;
 
 public:
 
@@ -31,31 +34,44 @@ public:
   std::map<std::string,std::string> daemon_metadata;
   std::map<std::string,std::string> daemon_status;
 
+  // encode map<string,map<int32_t,string>> of current config
+  bufferlist config_bl;
+
+  // encode map<string,string> of compiled-in defaults
+  bufferlist config_defaults_bl;
+
   void decode_payload() override
   {
-    bufferlist::iterator p = payload.begin();
-    ::decode(daemon_name, p);
+    auto p = payload.cbegin();
+    decode(daemon_name, p);
     if (header.version >= 2) {
-      ::decode(service_name, p);
-      ::decode(service_daemon, p);
+      decode(service_name, p);
+      decode(service_daemon, p);
       if (service_daemon) {
-       ::decode(daemon_metadata, p);
-       ::decode(daemon_status, p);
+       decode(daemon_metadata, p);
+       decode(daemon_status, p);
       }
     }
+    if (header.version >= 3) {
+      decode(config_bl, p);
+      decode(config_defaults_bl, p);
+    }
   }
 
   void encode_payload(uint64_t features) override {
-    ::encode(daemon_name, payload);
-    ::encode(service_name, payload);
-    ::encode(service_daemon, payload);
+    using ceph::encode;
+    encode(daemon_name, payload);
+    encode(service_name, payload);
+    encode(service_daemon, payload);
     if (service_daemon) {
-      ::encode(daemon_metadata, payload);
-      ::encode(daemon_status, payload);
+      encode(daemon_metadata, payload);
+      encode(daemon_status, payload);
     }
+    encode(config_bl, payload);
+    encode(config_defaults_bl, payload);
   }
 
-  const char *get_type_name() const override { return "mgropen"; }
+  std::string_view get_type_name() const override { return "mgropen"; }
   void print(ostream& out) const override {
     out << get_type_name() << "(";
     if (service_name.length()) {
@@ -71,7 +87,7 @@ public:
   }
 
   MMgrOpen()
-    : Message(MSG_MGR_OPEN, HEAD_VERSION, COMPAT_VERSION)
+    : MessageInstance(MSG_MGR_OPEN, HEAD_VERSION, COMPAT_VERSION)
   {}
 };