mon/OSDMonitor: Remove unused functions

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5d3388346808eba19a014b9794c11a8b27c482fd..0a9f0555610ad65c5eaed7f95affbaaba8752013 100644 (file)
--- 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_t,pg_stat_t>& 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<string, string>& m, ostream *err)
 {
   bufferlist bl;

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 4db2767839e86a63c8aacf05f6a2088d2a48f48c..3e5d030d6ee879e169ab870f7b3dda085db9bfac 100644 (file)
--- 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<pg_t,pg_stat_t>& pgm);
   unsigned scan_for_creating_pgs(
     const mempool::osdmap::map<int64_t,pg_pool_t>& pools,
     const mempool::osdmap::set<int64_t>& removed_pools,

diff --git a/src/osd/OSDMapMapping.h b/src/osd/OSDMapMapping.h
index f2affdc7fcef92fe55c0fe976a26bef8dc770596..794b26efc62c23b2b9ba0c4f7cb4b24a8b3bcc63 100644 (file)
--- 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<pg_t>& 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);