PG: wait until we've build the missing set to discover_all_missing

Fixes: #9179
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 72d349fca31a8995af385848ed8388c5af8e68c8..400ba0d613b3632d9df7cc4b79e1978fb8e14292 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1474,12 +1474,6 @@ void PG::activate(ObjectStore::Transaction& t,
   } else {
     dout(10) << "activate - not complete, " << missing << dendl;
     pg_log.activate_not_complete(info);
-    if (is_primary()) {
-      dout(10) << "activate - starting recovery" << dendl;
-      osd->queue_for_recovery(this);
-      if (have_unfound())
-       discover_all_missing(query_map);
-    }
   }
     
   log_weirdness();
@@ -1644,6 +1638,10 @@ void PG::activate(ObjectStore::Transaction& t,
       build_might_have_unfound();
 
       state_set(PG_STATE_DEGRADED);
+      dout(10) << "activate - starting recovery" << dendl;
+      osd->queue_for_recovery(this);
+      if (have_unfound())
+       discover_all_missing(query_map);
     }
 
     // degraded?