From: Xuehan Xu Date: Thu, 17 Aug 2023 03:09:05 +0000 (+0800) Subject: crimson/osd/pg: check if backfill_state exists when judging objects' X-Git-Tag: v18.2.1~158^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F53963%2Fhead;p=ceph.git crimson/osd/pg: check if backfill_state exists when judging objects' degradation Signed-off-by: Xuehan Xu (cherry picked from commit 04764838b5395a4e4d0c872f2d2a433fc4aec074) --- diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 3d5bb20d408b3..09f7c9cfe20cd 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -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;