osd: don't remove pg from recovery queue if not enough recovery ops started

The pg has already been dequeued at the beginning of do_recovery(),
and it requeues itself only if it starts a new recovery op.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 98961cf98549a41a972c32cc13d2f41ce5c99647..85e497431fb751142f95155d71b6bfb2649cc8e6 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5117,12 +5117,7 @@ void OSD::do_recovery(PG *pg)
 
       }
     }
-    else if (started < max) {
-      recovery_wq.lock();
-      pg->recovery_item.remove_myself();
-      recovery_wq.unlock();
-    }
-    
+
     do_notifies(notify_list, pg->get_osdmap()->get_epoch());  // notify? (residual|replica)
     do_queries(query_map);
     do_infos(info_map);