Clean up defer_recovery() functions

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 690bce68787773980528cf8e44e008b143f9aeed..eccaa4b89a46a4aafbe4ae2f3a884e49f700d89e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6134,15 +6134,6 @@ void OSD::finish_recovery_op(PG *pg, const hobject_t& soid, bool dequeue)
   recovery_wq.unlock();
 }
 
-void OSD::defer_recovery(PG *pg)
-{
-  dout(10) << "defer_recovery " << *pg << dendl;
-
-  // move pg to the end of the queue...
-  recovery_wq.queue(pg);
-}
-
-
 // =========================================================
 // OPS
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index f52973456f60f91aff6390822974f2f54655f9f4..c09ff224e71a42769f26b8f6ba0ca7778cbbe08b 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1254,7 +1254,6 @@ protected:
 
   void start_recovery_op(PG *pg, const hobject_t& soid);
   void finish_recovery_op(PG *pg, const hobject_t& soid, bool dequeue);
-  void defer_recovery(PG *pg);
   void do_recovery(PG *pg);
   bool _recover_now();
 

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index ae88be652daa4ab90352c7faccf464e47a3174ce..e769152ad41c082ad084d1465c6ad2a784a8416f 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2186,12 +2186,6 @@ void PG::split_into(pg_t child_pgid, PG *child, unsigned split_bits)
   dirty_log = true;
 }
 
-void PG::defer_recovery()
-{
-  // TODOSAM: osd->osd-> not good
-  osd->osd->defer_recovery(this);
-}
-
 void PG::clear_recovery_state() 
 {
   dout(10) << "clear_recovery_state" << dendl;

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 720fcb587727efe28cc383e8044b71bab8a17450..5cf9455345a2a8a0e819feaf884a26976ef58376 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -844,7 +844,6 @@ public:
   void cancel_recovery();
   void clear_recovery_state();
   virtual void _clear_recovery_state() = 0;
-  void defer_recovery();
   virtual void check_recovery_sources(const OSDMapRef newmap) = 0;
   void start_recovery_op(const hobject_t& soid);
   void finish_recovery_op(const hobject_t& soid, bool dequeue=false);