From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 18 Nov 2017 13:04:37 +0000 (+0800)
Subject: Merge pull request #18484 from Liuchang0812/wip-mgr-request-osd-metadata
X-Git-Tag: v13.0.1~178
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0a7ef57e0e97ce2e0464949ecd0df385c12abb6;p=ceph.git

Merge pull request #18484 from Liuchang0812/wip-mgr-request-osd-metadata

mgr: request daemon's metadata when receiving a report from an unknown server

Reviewed-by: John Spray <john.spray@redhat.com>
---

e0a7ef57e0e97ce2e0464949ecd0df385c12abb6
diff --cc src/mgr/Mgr.h
index 9a6b3974b291,b1e6d064946e..a4d8aad39ff7
--- a/src/mgr/Mgr.h
+++ b/src/mgr/Mgr.h
@@@ -102,7 -100,35 +102,36 @@@ public
    void shutdown();
  
    std::vector<MonCommand> get_command_set() const;
 +  std::map<std::string, std::string> get_services() const;
  };
  
+ /**
+  * Context for completion of metadata mon commands: take
+  * the result and stash it in DaemonStateIndex
+  */
+ class MetadataUpdate : public Context
+ {
+ 
+ private:
+   DaemonStateIndex &daemon_state;
+   DaemonKey key;
+ 
+   std::map<std::string, std::string> defaults;
+ 
+ public:
+   bufferlist outbl;
+   std::string outs;
+ 
+   MetadataUpdate(DaemonStateIndex &daemon_state_, const DaemonKey &key_)
+     : daemon_state(daemon_state_), key(key_) {}
+ 
+   void set_default(const std::string &k, const std::string &v)
+   {
+     defaults[k] = v;
+   }
+ 
+   void finish(int r) override;
+ };
+ 
+ 
  #endif