]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: do not assert on clone_size mismatch
authorSage Weil <sage@inktank.com>
Thu, 27 Mar 2014 20:37:23 +0000 (13:37 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Mar 2014 20:48:33 +0000 (13:48 -0700)
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index 1e57a3384528c17e3498ce863826b5bf24ed7a6f..1e9584b4be7a15c9d2af59d3622cb1b1911f9198 100644 (file)
@@ -11146,7 +11146,12 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
        assert(soid.snap == *curclone);
       }
 
-      assert(oi.size == snapset.clone_size[*curclone]);
+      if (oi.size != snapset.clone_size[*curclone]) {
+       osd->clog.error() << mode << " " << info.pgid << " " << soid
+                         << " size " << oi.size << " != clone_size "
+                         << snapset.cloen_size[*curclone];
+       ++scrubber.shallow_errors;
+      }
 
       // verify overlap?
       // ...