From ed7a74464de651dea15f3ff6a4b978d7fcb8c5e6 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Sat, 3 Feb 2018 11:56:26 +1000 Subject: [PATCH] mon/OSDMonitor: Remove unused functions Signed-off-by: Brad Hubbard --- src/mon/OSDMonitor.cc | 17 ----------------- src/mon/OSDMonitor.h | 2 -- src/osd/OSDMapMapping.h | 6 ------ 3 files changed, 25 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 5d338834680..0a9f0555610 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1346,23 +1346,6 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t) encode_health(next, t); } -void OSDMonitor::trim_creating_pgs(creating_pgs_t* creating_pgs, - const ceph::unordered_map& pg_stat) -{ - auto p = creating_pgs->pgs.begin(); - while (p != creating_pgs->pgs.end()) { - auto q = pg_stat.find(p->first); - if (q != pg_stat.end() && - !(q->second.state & PG_STATE_CREATING)) { - dout(20) << __func__ << " pgmap shows " << p->first << " is created" - << dendl; - p = creating_pgs->pgs.erase(p); - } else { - ++p; - } - } -} - int OSDMonitor::load_metadata(int osd, map& m, ostream *err) { bufferlist bl; diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 4db2767839e..3e5d030d6ee 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -465,8 +465,6 @@ protected: creating_pgs_t update_pending_pgs(const OSDMap::Incremental& inc, const OSDMap& nextmap); - void trim_creating_pgs(creating_pgs_t *creating_pgs, - const ceph::unordered_map& pgm); unsigned scan_for_creating_pgs( const mempool::osdmap::map& pools, const mempool::osdmap::set& removed_pools, diff --git a/src/osd/OSDMapMapping.h b/src/osd/OSDMapMapping.h index f2affdc7fce..794b26efc62 100644 --- a/src/osd/OSDMapMapping.h +++ b/src/osd/OSDMapMapping.h @@ -293,12 +293,6 @@ public: assert(osd < acting_rmap.size()); return acting_rmap[osd]; } - /* unsued - const std::vector& get_osd_up_pgs(unsigned osd) { - assert(osd < up_rmap.size()); - return up_rmap[osd]; - } - */ void update(const OSDMap& map); void update(const OSDMap& map, pg_t pgid); -- 2.47.3