From 63abf11390bb9b8dd604aae2b3e90596f9ab65ac Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Jul 2014 18:25:53 -0700 Subject: [PATCH] osd/ReplicatedPG: observe INCOMPLETE_CLONES in is_present_clone() 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 --- src/osd/ReplicatedPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index ea30184626bf..c6f52ec2ac26 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -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; -- 2.47.3