Merge pull request #1299 from ceph/wip-repair

osd/PG: fix assert when a shallow repair has fixed all errors.

Reviewed-by: David Zafman <david.zafman@inktank.com>
This commit is contained in:
David Zafman 2014-02-22 14:55:08 -08:00
commit bfb3a2479a

View File

@ -4291,7 +4291,7 @@ void PG::scrub_finish()
// when every one has been fixed.
if (repair) {
if (scrubber.fixed == scrubber.shallow_errors + scrubber.deep_errors) {
assert(deep_scrub);
assert(deep_scrub || scrubber.deep_errors == 0);
scrubber.shallow_errors = scrubber.deep_errors = 0;
} else {
// Deep scrub in order to get corrected error counts