From: Samuel Just <samuel.just@dreamhost.com>
Date: Fri, 19 Aug 2011 01:15:53 +0000 (-0700)
Subject: ReplicatedPG: Don't crash when a clone is missing
X-Git-Tag: v0.34~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8db7daf68d8e9721c0c6a8ade7afe20df219db24;p=ceph.git

ReplicatedPG: Don't crash when a clone is missing

Print an error rather than crashing when _scrub finds a missing
clone.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ad91248c346a..b5d29bb59ddb 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4843,8 +4843,7 @@ int ReplicatedPG::_scrub(ScrubMap& scrubmap, int& errors, int& fixed)
 
       // did we finish the last oid?
       if (head != sobject_t()) {
-	dout(0) << " missing clone(s) for " << head << dendl;
-	assert(head == sobject_t());  // we had better be done
+	osd->clog.error() << "Missing clone(s) for " << head << "\n";
 	errors++;
       }