Check & remove extra chunks for degraded / incomplete objects, too

Vitaliy Filippov 2021-03-07 14:36:20 +03:00
parent 80e12358a2
commit 1be94da437
1 changed files with 10 additions and 12 deletions

View File

@ -365,9 +365,8 @@ resume_7:
recovery_stat_bytes[0][recovery_type] += op_data->stripes[role].write_end - op_data->stripes[role].write_start;
}
}
if (op_data->object_state->state & OBJ_MISPLACED)
{
// Remove extra chunks
// Any kind of a non-clean object can have extra chunks, because we don't record objects
// as degraded & misplaced or incomplete & misplaced at the same time. So try to remove extra chunks
submit_primary_del_subops(cur_op, pg.cur_set.data(), pg.pg_size, op_data->object_state->osd_set);
if (op_data->n_subops > 0)
{
@ -381,7 +380,6 @@ resume_9:
return;
}
}
}
// Clear object state
remove_object_from_state(op_data->oid, op_data->object_state, pg);
pg.clean_count++;