]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: tolerate trailing missing clones on cache tiers
authorSage Weil <sage@inktank.com>
Sat, 29 Mar 2014 23:57:48 +0000 (16:57 -0700)
committerSage Weil <sage@inktank.com>
Sat, 29 Mar 2014 23:57:48 +0000 (16:57 -0700)
I missed this case in eb71924ea27e78d97bd45674ef5e6a7fce30932f.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index ab47f76aa264ef776d45b0a3086475eb7dcac462..23248ee56d780de2137daa91c3a0c689041cc511 100644 (file)
@@ -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;