From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Mar 2014 20:37:23 +0000 (-0700)
Subject: osd/ReplicatedPG: do not assert on clone_size mismatch
X-Git-Tag: v0.79~72^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e2cd5feafd2cac36385d34356b7e9d5d5230824;p=ceph.git

osd/ReplicatedPG: do not assert on clone_size mismatch

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 1e57a3384528..1e9584b4be7a 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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?
       // ...