update sources to v12.1.1

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

diff --git a/ceph/src/messages/MMgrOpen.h b/ceph/src/messages/MMgrOpen.h
index 13c67586b99f6b21e213fddd628aa1323f193f13..5db75e3f19586bb2be337ef89ec26f34d4945427 100644 (file)
--- a/ceph/src/messages/MMgrOpen.h
+++ b/ceph/src/messages/MMgrOpen.h
@@ -19,26 +19,55 @@
 
 class MMgrOpen : public Message
 {
-  static const int HEAD_VERSION = 1;
+  static const int HEAD_VERSION = 2;
   static const int COMPAT_VERSION = 1;
 
 public:
 
   std::string daemon_name;
+  std::string service_name;  // optional; otherwise infer from entity type
+
+  bool service_daemon = false;
+  std::map<std::string,std::string> daemon_metadata;
+  std::map<std::string,std::string> daemon_status;
 
   void decode_payload() override
   {
     bufferlist::iterator p = payload.begin();
     ::decode(daemon_name, p);
+    if (header.version >= 2) {
+      ::decode(service_name, p);
+      ::decode(service_daemon, p);
+      if (service_daemon) {
+       ::decode(daemon_metadata, p);
+       ::decode(daemon_status, p);
+      }
+    }
   }
 
   void encode_payload(uint64_t features) override {
     ::encode(daemon_name, payload);
+    ::encode(service_name, payload);
+    ::encode(service_daemon, payload);
+    if (service_daemon) {
+      ::encode(daemon_metadata, payload);
+      ::encode(daemon_status, payload);
+    }
   }
 
   const char *get_type_name() const override { return "mgropen"; }
   void print(ostream& out) const override {
-    out << get_type_name() << "(" << daemon_name << ")"; 
+    out << get_type_name() << "(";
+    if (service_name.length()) {
+      out << service_name;
+    } else {
+      out << ceph_entity_type_name(get_source().type());
+    }
+    out << "." << daemon_name;
+    if (service_daemon) {
+      out << " daemon";
+    }
+    out << ")";
   }
 
   MMgrOpen()