OSD: bail out of do_recovery if no longer primary and active

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f8e3f13bd1254c386ff845e420467fb9584b2cb8..bd26e2d260465538f7431c09e32c5f377e9f3e15 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4768,7 +4768,7 @@ void OSD::do_recovery(PG *pg)
     recovery_wq.queue(pg);
   } else {
     pg->lock();
-    if (pg->deleting) {
+    if (pg->deleting || !(pg->is_active() && pg->is_primary())) {
       pg->unlock();
       pg->put();
       return;