From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 19 May 2017 07:00:42 +0000 (-0700)
Subject: mon: pgstat: remove get_osd_stat() from post-luminous state
X-Git-Tag: ses5-milestone6~8^2~19^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=459ec61901a3e7d58e971b96a06eb99b43e19571;p=ceph.git

mon: pgstat: remove get_osd_stat() from post-luminous state

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 1c44daaf345..863672afe7f 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -33,7 +33,6 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon,
 }
 
 
-
 void MgrMonitor::create_initial()
 {
 }
diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index 44ef1074d0a..4f3d392e813 100644
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -27,17 +27,6 @@ public:
   const pool_stat_t& get_pg_sum() const override { return digest.pg_sum; }
   const osd_stat_t& get_osd_sum() const override { return digest.osd_sum; }
 
-  const osd_stat_t *get_osd_stat(int osd) const override {
-    auto i = digest.osd_stat.find(osd);
-    if (i == digest.osd_stat.end()) {
-      return nullptr;
-    }
-    return &i->second;
-  }
-  const mempool::pgmap::unordered_map<int32_t,osd_stat_t> &get_osd_stat() const override {
-    return digest.osd_stat;
-  }
-
   size_t get_num_pg_by_osd(int osd) const override {
     return digest.get_num_pg_by_osd(osd);
   }
diff --git a/src/mon/PGStatService.h b/src/mon/PGStatService.h
index 4916f90500d..674dd874a31 100644
--- a/src/mon/PGStatService.h
+++ b/src/mon/PGStatService.h
@@ -41,8 +41,12 @@ public:
   virtual const pool_stat_t& get_pg_sum() const = 0;
   virtual const osd_stat_t& get_osd_sum() const = 0;
 
-  virtual const osd_stat_t *get_osd_stat(int osd) const = 0;
-  virtual const mempool::pgmap::unordered_map<int32_t,osd_stat_t>& get_osd_stat() const = 0;
+  virtual const osd_stat_t *get_osd_stat(int osd) const {
+    ceph_abort();
+  }
+  virtual const mempool::pgmap::unordered_map<int32_t,osd_stat_t>& get_osd_stat() const {
+    ceph_abort();
+  }
   virtual float get_full_ratio() const {
     ceph_abort();
   }