]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: observe INCOMPLETE_CLONES in is_present_clone() 2141/head
authorSage Weil <sage@redhat.com>
Thu, 24 Jul 2014 01:25:53 +0000 (18:25 -0700)
committerSage Weil <sage@redhat.com>
Thu, 24 Jul 2014 17:07:33 +0000 (10:07 -0700)
We cannot assume that just because cache_mode is NONE that we will have
all clones present; check for the absense of the INCOMPLETE_CLONES flag
here too.

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

index ea30184626bf6123a016ef89715024b7b0ffa129..c6f52ec2ac2656ccb0fbb2bf13512d820b5abb7c 100644 (file)
@@ -6479,7 +6479,7 @@ void ReplicatedPG::cancel_flush_ops(bool requeue)
 
 bool ReplicatedPG::is_present_clone(hobject_t coid)
 {
-  if (pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE)
+  if (!pool.info.allow_incomplete_clones())
     return true;
   if (is_missing_object(coid))
     return true;