Merge pull request ceph#65283 from xxhdx1985126/wip-72763

athanatos · web-flow · commit 8c781c87ae85 · 2025-09-22T17:06:40.000-07:00
crimson/osd/osd_operations/client_request: rely on the checks in PG::do_recover_missing() to determine whether to recover clone objects

Reviewed-by: Matan Breizman &lt;mbreizma@redhat.com&gt;
diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
@@ -361,8 +361,7 @@ ClientRequest::process_op(
     }
 
     std::set<snapid_t> snaps = snaps_need_to_recover();
-    if (!snaps.empty() &&
-        pg->is_missing_head_and_clones(m->get_hobj().get_head())) {
+    if (!snaps.empty()) {
       co_await recover_missing_snaps(pg, snaps);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -361,8 +361,7 @@ ClientRequest::process_op(`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`std::set<snapid_t> snaps = snaps_need_to_recover();`
`364`		`- if (!snaps.empty() &&`
`365`		`- pg->is_missing_head_and_clones(m->get_hobj().get_head())) {`
	`364`	`+ if (!snaps.empty()) {`
`366`	`365`	`co_await recover_missing_snaps(pg, snaps);`
`367`	`366`	`}`
`368`	`367`	`}`