From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 28 Mar 2018 11:02:35 +0000 (+0800)
Subject: Merge pull request #20660 from Leeshine/wip-mon-op-tracker
X-Git-Tag: v13.1.0~466
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea97c120d2173f2fc70d979d57a7edb2a6c5da5e;p=ceph.git

Merge pull request #20660 from Leeshine/wip-mon-op-tracker

mon,mgr: make  osd_metric more popular and report slow ops to mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

ea97c120d2173f2fc70d979d57a7edb2a6c5da5e
diff --cc src/mgr/MgrClient.h
index 09d90851bb4,885a74259c9..91618ce2015
--- a/src/mgr/MgrClient.h
+++ b/src/mgr/MgrClient.h
@@@ -120,12 -120,11 +120,12 @@@ public
      const std::map<std::string,std::string>& metadata);
    int service_daemon_update_status(
      std::map<std::string,std::string>&& status);
-   void update_osd_health(std::vector<OSDHealthMetric>&& metrics);
+   void update_daemon_health(std::vector<DaemonHealthMetric>&& metrics);
  
  private:
 -  void send_stats();
 -  void send_report();
 +  void _send_stats();
 +  void _send_pgstats();
 +  void _send_report();
  };
  
  #endif