]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd/PG: fix assert when deep repair finds no errors" 1311/head
authorDavid Zafman <david.zafman@inktank.com>
Tue, 25 Feb 2014 03:56:48 +0000 (19:56 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Tue, 25 Feb 2014 03:56:48 +0000 (19:56 -0800)
This reverts commit e3e3328ec8a57f1ae2a2fd9893c51068798720a0.

src/osd/PG.cc

index aa2d3568727476f0d8d327a889867db90f55817c..a525b7195299c0a57695723a7dbb2f5f79796e44 100644 (file)
@@ -4293,7 +4293,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 || scrubber.deep_errors == 0);
+      assert(deep_scrub);
       scrubber.shallow_errors = scrubber.deep_errors = 0;
     } else {
       // Deep scrub in order to get corrected error counts