From: Sage Weil <sage@inktank.com>
Date: Sat, 29 Mar 2014 23:57:48 +0000 (-0700)
Subject: osd/ReplicatedPG: tolerate trailing missing clones on cache tiers
X-Git-Tag: v0.79~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfd6f23a6949415a50fa03b85871e43b352e649b;p=ceph.git

osd/ReplicatedPG: tolerate trailing missing clones on cache tiers

I missed this case in eb71924ea27e78d97bd45674ef5e6a7fce30932f.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ab47f76aa264..23248ee56d78 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11081,7 +11081,8 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
       ::decode(snapset, blp);
 
       // did we finish the last oid?
-      if (head != hobject_t()) {
+      if (head != hobject_t() &&
+	  pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE) {
 	osd->clog.error() << mode << " " << info.pgid << " " << head
 			  << " missing clones";
         ++scrubber.shallow_errors;