RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-20 09:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/scrub: minor log changes

Browse Source 
mostly related to the replica scrub interactions.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
This commit is contained in:
Ronen Friedman 2022-10-03 07:25:12 +00:00
parent 967a4a4ab7
commit 8d68a30be9
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/scrubber/PrimaryLogScrub.cc
View File

@ -63,6 +63,10 @@ void PrimaryLogScrub::submit_digest_fixes(const digests_fixes_t& fixes)
num_digest_updates_pending--;
continue;
}
dout(15) << fmt::format(
"{}: {}, pg[{}] {}/{}", __func__, num_digest_updates_pending,
m_pg_id, obj, dgs)
<< dendl;
if (obc->obs.oi.soid != obj) {
m_osds->clog->error()
<< m_pg_id << " " << m_mode_desc << " " << obj

2
src/osd/scrubber/osd_scrub_sched.cc
View File

@ -513,7 +513,7 @@ Scrub::schedule_result_t ScrubQueue::select_from_group(
}
}
dout(20) << " returning 'none ready' " << dendl;
dout(20) << " returning 'none ready'" << dendl;
return Scrub::schedule_result_t::none_ready;
}

30
src/osd/scrubber/scrub_backend.cc
View File

@ -1062,17 +1062,25 @@ ScrubBackend::auth_and_obj_errs_t ScrubBackend::match_in_shards(
ho.has_snapset());
dout(20) << fmt::format(
"{}: {} {} {} shards: {} {} {}",
__func__,
(m_repair ? " repair " : " "),
(m_is_replicated ? "replicated " : ""),
(srd == auth_sel.auth_shard ? "auth" : ""),
auth_sel.shard_map.size(),
(auth_sel.digest_match ? " digest_match " : " "),
(auth_sel.shard_map[srd].only_data_digest_mismatch_info()
? "'info mismatch info'"
: ""))
<< dendl;
"{}: {}{} <{}:{}> shards: {} {} {}", __func__,
(m_repair ? "repair " : ""),
(m_is_replicated ? "replicated " : ""), srd,
(srd == auth_sel.auth_shard ? "auth" : "-"),
auth_sel.shard_map.size(),
(auth_sel.digest_match ? " digest_match " : " "),
(auth_sel.shard_map[srd].only_data_digest_mismatch_info()
? "'info mismatch info'"
: ""))
<< dendl;
if (discrep_found) {
dout(10) << fmt::format(
"{}: <{}> auth:{} ({}/{}) vs {} ({}/{}) {}", __func__, ho,
auth_sel.auth_shard, auth_object.omap_digest_present,
auth_object.omap_digest, srd,
smap.objects[ho].omap_digest_present ? true : false,
smap.objects[ho].omap_digest, ss.str())
<< dendl;
}
// If all replicas match, but they don't match object_info we can
// repair it by using missing_digest mechanism