thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow scrub to fix corrupted object states

Browse Source
This commit is contained in:
Vitaliy Filippov
2023-05-20 23:19:39 +03:00
parent 4bfd994341
commit 6ca20aa194
7 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osd_primary.cpp
+27 -8
View File
@@ -329,21 +329,40 @@ pg_osd_set_state_t *osd_t::mark_object_corrupted(pg_t & pg, object_id oid, pg_os
}
// Mark object chunk(s) as corrupted
int changes = 0;
for (auto & chunk: corrupted_set)
for (auto chunk_it = corrupted_set.begin(); chunk_it != corrupted_set.end(); )
{
bool corrupted = stripes[chunk.role].osd_num == chunk.osd_num && stripes[chunk.role].read_error;
if (corrupted)
auto & chunk = *chunk_it;
if (stripes[chunk.role].osd_num == chunk.osd_num)
{
if (!(chunk.loc_bad & LOC_CORRUPTED))
if (stripes[chunk.role].not_exists)
{
changes++;
chunk.loc_bad |= LOC_CORRUPTED;
corrupted_set.erase(chunk_it, chunk_it+1);
continue;
}
if (stripes[chunk.role].read_error && chunk.loc_bad != LOC_CORRUPTED)
{
changes++;
chunk.loc_bad = LOC_CORRUPTED;
}
else if (stripes[chunk.role].read_end > 0 && !stripes[chunk.role].missing &&
(chunk.loc_bad & LOC_CORRUPTED))
{
changes++;
chunk.loc_bad &= ~LOC_CORRUPTED;
}
}
else if (inconsistent && !(chunk.loc_bad & LOC_OUTDATED))
if (inconsistent && !chunk.loc_bad)
{
if (!(chunk.loc_bad & LOC_INCONSISTENT))
changes++;
changes++;
chunk.loc_bad |= LOC_INCONSISTENT;
}
else if (!inconsistent && (chunk.loc_bad & LOC_INCONSISTENT))
{
changes++;
chunk.loc_bad &= ~LOC_INCONSISTENT;
}
chunk_it++;
}
if (!changes)
{