update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mgr / ServiceMap.h

diff --git a/ceph/src/mgr/ServiceMap.h b/ceph/src/mgr/ServiceMap.h
index 99165112731f0dfd48bf024eed702c0c1e980389..d2a1c9b37c140b5d1a77b9e31a2b25a81d5950d6 100644 (file)
--- a/ceph/src/mgr/ServiceMap.h
+++ b/ceph/src/mgr/ServiceMap.h
@@ -25,7 +25,7 @@ struct ServiceMap {
     std::map<std::string,std::string> metadata;  ///< static metadata
 
     void encode(bufferlist& bl, uint64_t features) const;
-    void decode(bufferlist::iterator& p);
+    void decode(bufferlist::const_iterator& p);
     void dump(Formatter *f) const;
     static void generate_test_instances(std::list<Daemon*>& ls);
   };
@@ -35,7 +35,7 @@ struct ServiceMap {
     std::string summary;   ///< summary status string for 'ceph -s'
 
     void encode(bufferlist& bl, uint64_t features) const;
-    void decode(bufferlist::iterator& p);
+    void decode(bufferlist::const_iterator& p);
     void dump(Formatter *f) const;
     static void generate_test_instances(std::list<Service*>& ls);
 
@@ -49,6 +49,18 @@ struct ServiceMap {
       std::ostringstream ss;
       ss << daemons.size() << (daemons.size() > 1 ? " daemons" : " daemon")
         << " active";
+
+      if (!daemons.empty()) {
+       ss << " (";
+       for (auto p = daemons.begin(); p != daemons.end(); ++p) {
+         if (p != daemons.begin()) {
+           ss << ", ";
+         }
+         ss << p->first;
+       }
+       ss << ")";
+      }
+
       return ss.str();
     }
 
@@ -71,7 +83,7 @@ struct ServiceMap {
   map<std::string,Service> services;
 
   void encode(bufferlist& bl, uint64_t features) const;
-  void decode(bufferlist::iterator& p);
+  void decode(bufferlist::const_iterator& p);
   void dump(Formatter *f) const;
   static void generate_test_instances(std::list<ServiceMap*>& ls);