update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / osd / pg.cc

diff --git a/ceph/src/crimson/osd/pg.cc b/ceph/src/crimson/osd/pg.cc
index 3d5bb20d408b33c0b3eb995e3d9a0ac8d8ffe5b8..7cf3b158c89cfff19e0bd55ba49270048816136f 100644 (file)
--- a/ceph/src/crimson/osd/pg.cc
+++ b/ceph/src/crimson/osd/pg.cc
@@ -535,7 +535,7 @@ void PG::on_active_advmap(const OSDMapRef &osdmap)
     }
     logger().info("{}: {} new removed snaps {}, snap_trimq now{}",
                   *this, __func__, it->second, snap_trimq);
-    assert(!bad || local_conf().get_val<bool>("osd_debug_verify_cached_snaps"));
+    assert(!bad || !local_conf().get_val<bool>("osd_debug_verify_cached_snaps"));
   }
 }
 
@@ -1510,6 +1510,7 @@ bool PG::is_degraded_or_backfilling_object(const hobject_t& soid) const {
     // we are backfilling it
     if (is_backfill_target(peer) &&
         peering_state.get_peer_info(peer).last_backfill <= soid &&
+        recovery_handler->backfill_state &&
        recovery_handler->backfill_state->get_last_backfill_started() >= soid &&
        recovery_backend->is_recovering(soid)) {
       return true;