From: David Zafman <david.zafman@inktank.com>
Date: Tue, 25 Feb 2014 03:56:48 +0000 (-0800)
Subject: Revert "osd/PG: fix assert when deep repair finds no errors"
X-Git-Tag: v0.78~118^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1311%2Fhead;p=ceph.git

Revert "osd/PG: fix assert when deep repair finds no errors"

This reverts commit e3e3328ec8a57f1ae2a2fd9893c51068798720a0.
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index aa2d35687274..a525b7195299 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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