From 459ec61901a3e7d58e971b96a06eb99b43e19571 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Fri, 19 May 2017 00:00:42 -0700 Subject: [PATCH] mon: pgstat: remove get_osd_stat() from post-luminous state Signed-off-by: Greg Farnum --- src/mon/MgrMonitor.cc | 1 - src/mon/MgrStatMonitor.cc | 11 ----------- src/mon/PGStatService.h | 8 ++++++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 1c44daaf345bf..863672afe7f5d 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 44ef1074d0a27..4f3d392e81334 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 &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 4916f90500de1..674dd874a315e 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& get_osd_stat() const = 0; + virtual const osd_stat_t *get_osd_stat(int osd) const { + ceph_abort(); + } + virtual const mempool::pgmap::unordered_map& get_osd_stat() const { + ceph_abort(); + } virtual float get_full_ratio() const { ceph_abort(); } -- 2.39.5