RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53409 from xxhdx1985126/wip-crimson-recover-head-first

Browse Source 
crimson/osd/pg_recovery: recover head before recovering clones

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Samuel Just 2023-12-10 19:58:55 -08:00 committed by GitHub
commit 6532501f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/crimson/osd/pg_recovery.cc
View File

@ -140,13 +140,14 @@ size_t PGRecovery::start_primary_recovery_ops(
hobject_t head = soid.get_head();
bool head_missing = missing.is_missing(head);
logger().info(
"{} {} item.need {} {} {} {} {}",
__func__,
soid,
item.need,
missing.is_missing(soid) ? " (missing)":"",
missing.is_missing(head) ? " (missing head)":"",
head_missing ? " (missing head)":"",
pg->get_recovery_backend()->is_recovering(soid) ? " (recovering)":"",
pg->get_recovery_backend()->is_recovering(head) ? " (recovering head)":"");
@ -158,7 +159,15 @@ size_t PGRecovery::start_primary_recovery_ops(
} else if (pg->get_recovery_backend()->is_recovering(head)) {
++skipped;
} else {
out->emplace_back(recover_missing(trigger, soid, item.need));
if (head_missing) {
auto it = missing.get_items().find(head);
assert(it != missing.get_items().end());
auto head_need = it->second.need;
out->emplace_back(recover_missing(trigger, head, head_need));
++skipped;
} else {
out->emplace_back(recover_missing(trigger, soid, item.need));
}
++started;
}