osd/PG: move a few assertions, flag change into start_recovery_ops()

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 55d80ebab96ffd4618558c4889957bf410ef8a3d..4c21f392d573f3ddb4a3b4bd8600d32a2289fdfb 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8841,12 +8841,6 @@ void OSD::do_recovery(
       goto out;
     }
 
-    assert(!pg->is_deleting());
-    assert(pg->is_peered() && pg->is_primary());
-
-    assert(pg->recovery_queued);
-    pg->recovery_queued = false;
-
     dout(10) << "do_recovery starting " << reserved_pushes << " " << *pg << dendl;
 #ifdef DEBUG_RECOVERY_OIDS
     dout(20) << "  active was " << service.recovery_oids[pg->pg_id] << dendl;

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 45ed663e73432c92355ce1a91d4f8e5277b51dbd..bcf07ed20b26203b8743767a9f4c864966ee1a6b 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -11083,6 +11083,11 @@ bool PrimaryLogPG::start_recovery_ops(
   started = 0;
   bool work_in_progress = false;
   assert(is_primary());
+  assert(is_peered());
+  assert(!is_deleting());
+
+  assert(recovery_queued);
+  recovery_queued = false;
 
   if (!state_test(PG_STATE_RECOVERING) &&
       !state_test(PG_STATE_BACKFILLING)) {