RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15368 from dzafman/wip-20089

Browse Source 
osd: When scrub finds an attr error mark shard inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
David Zafman 2017-05-30 10:46:23 -07:00 committed by GitHub
commit 1dbb15d340
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/PGBackend.cc
View File

@ -782,16 +782,15 @@ void PGBackend::be_compare_scrubmaps(
object_error,
ss);
// Some errors might have already been set in be_select_auth_object()
if (shard_map[j->first].errors != 0) {
if (found || shard_map[j->first].errors != 0) {
cur_inconsistent.insert(j->first);
if (shard_map[j->first].has_deep_errors())
++deep_errors;
else
else if (shard_map[j->first].has_shallow_errors())
++shallow_errors;
// Only true if be_compare_scrub_objects() found errors and put something
// in ss.
if (found)
errorstream << pgid << " shard " << j->first << ": soid " << *k
errorstream << pgid << " shard " << j->first << ": soid " << *k
<< " " << ss.str() << "\n";
} else {
// XXX: The auth shard might get here that we don't know