osd: kill unused on_osd_failure() hook

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d353044a382224ac17c41a7e3e767c20b36676c4..7621f7ca063c20e2b2efca62f95739239cc5b4a1 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3550,13 +3550,6 @@ void PG::start_peering_interval(const OSDMap *lastmap,
 
     
   // pg->on_*
-  /* TODO on_osd_failure does NOTHING! */
-#if 0
-  for (unsigned i=0; i<oldacting.size(); i++)
-    if (osdmap->is_down(oldacting[i]))
-      ->on_osd_failure(oldacting[i]);
-#endif
-
   on_change();
 
   if (deleting) {

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 38b230b6f244db888c521d2e9c1724b261283a84..a2ef11d72f3fb226a21da28c3132a25691be99e5 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1691,7 +1691,6 @@ public:
   virtual bool same_for_modify_since(epoch_t e) = 0;
   virtual bool same_for_rep_modify_since(epoch_t e) = 0;
 
-  virtual void on_osd_failure(int osd) = 0;
   virtual void on_role_change() = 0;
   virtual void on_change() = 0;
   virtual void on_activate() = 0;

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c083515a593cce74e19a774a443b15159016d2ee..f11e42840b157492f7a2a4b963c9699e17493c57 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4687,11 +4687,6 @@ void ReplicatedPG::_finish_mark_all_unfound_lost(list<ObjectContext*>& obcs)
  * pg status change notification
  */
 
-void ReplicatedPG::on_osd_failure(int o)
-{
-  //dout(10) << "on_osd_failure " << o << dendl;
-}
-
 void ReplicatedPG::apply_and_flush_repops(bool requeue)
 {
   list<Message*> rq;

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 7173a400fe51a85ef4106597c23a5b4ff639d284..5cb5f98798f72080709f8a8cd49052b068e8da61 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -820,8 +820,6 @@ public:
                                  utime_t mtime, int what);
   void _finish_mark_all_unfound_lost(list<ObjectContext*>& obcs);
 
-  void on_osd_failure(int o);
-  void on_acker_change();
   void on_role_change();
   void on_change();
   void on_activate();