mon/PGMap: remove legacy encode/decode methods

These were used by PGMonitor when stored in per-pg and per-osd k/v
pairs.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index c0a963a07275299683718a90f4b1de13a97ee7c9..6aa23da5c081059a0adba105054349c50c36be2a 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1116,49 +1116,6 @@ void PGMap::calc_stats()
     stat_osd_add(p->first, p->second);
 }
 
-void PGMap::update_pg(pg_t pgid, bufferlist& bl)
-{
-  bufferlist::iterator p = bl.begin();
-  auto s = pg_stat.find(pgid);
-  if (s != pg_stat.end()) {
-    stat_pg_update(pgid, s->second, p);
-  } else {
-    pg_stat_t& r = pg_stat[pgid];
-    ::decode(r, p);
-    stat_pg_add(pgid, r);
-  }
-}
-
-void PGMap::remove_pg(pg_t pgid)
-{
-  auto s = pg_stat.find(pgid);
-  if (s != pg_stat.end()) {
-    stat_pg_sub(pgid, s->second);
-    pg_stat.erase(s);
-  }
-}
-
-void PGMap::update_osd(int osd, bufferlist& bl)
-{
-  bufferlist::iterator p = bl.begin();
-  auto o = osd_stat.find(osd);
-  if (o != osd_stat.end()) {
-    stat_osd_sub(osd, o->second);
-  }
-  osd_stat_t& r = osd_stat[osd];
-  ::decode(r, p);
-  stat_osd_add(osd, r);
-}
-
-void PGMap::remove_osd(int osd)
-{
-  auto o = osd_stat.find(osd);
-  if (o != osd_stat.end()) {
-    stat_osd_sub(osd, o->second);
-    osd_stat.erase(o);
-  }
-}
-
 void PGMap::stat_pg_add(const pg_t &pgid, const pg_stat_t &s,
                         bool sameosds)
 {
@@ -1284,29 +1241,6 @@ void PGMap::stat_pg_sub(const pg_t &pgid, const pg_stat_t &s,
   }
 }
 
-void PGMap::stat_pg_update(const pg_t pgid, pg_stat_t& s,
-                           bufferlist::iterator& blp)
-{
-  pg_stat_t n;
-  ::decode(n, blp);
-
-  bool sameosds =
-    s.acting == n.acting &&
-    s.up == n.up &&
-    s.blocked_by == n.blocked_by;
-
-  stat_pg_sub(pgid, s, sameosds);
-
-  // if acting_primary has shift to an just restored osd, and pg yet to finish
-  // peering, many attributes in current stats remain stale. others seem don't
-  // mater much while faulty last_active will make "pg stuck in" check unhappy.
-  if (!(n.state & (PG_STATE_ACTIVE | PG_STATE_PEERED)) &&
-      n.last_active < s.last_active)
-    n.last_active = s.last_active;
-  s = n;
-  stat_pg_add(pgid, n, sameosds);
-}
-
 void PGMap::stat_osd_add(int osd, const osd_stat_t &s)
 {
   num_osd++;

diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index 0258fadd2222a16ddad58872d664874b5735451c..37cc6f7b8be2978d6633744896223dd33031ce5f 100644 (file)
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -375,18 +375,12 @@ public:
   }
 
 
-  void update_pg(pg_t pgid, bufferlist& bl);
-  void remove_pg(pg_t pgid);
-  void update_osd(int osd, bufferlist& bl);
-  void remove_osd(int osd);
-
   void apply_incremental(CephContext *cct, const Incremental& inc);
   void calc_stats();
   void stat_pg_add(const pg_t &pgid, const pg_stat_t &s,
                   bool sameosds=false);
   void stat_pg_sub(const pg_t &pgid, const pg_stat_t &s,
                   bool sameosds=false);
-  void stat_pg_update(const pg_t pgid, pg_stat_t &prev, bufferlist::iterator& blp);
   void stat_osd_add(int osd, const osd_stat_t &s);
   void stat_osd_sub(int osd, const osd_stat_t &s);