From 41364711a66c89ce2e94435fe0d54eeda6092614 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Jul 2014 18:24:51 -0700 Subject: [PATCH] osd/ReplicatedPG: observed INCOMPLETE_CLONES when doing clone subsets During recovery, we can clone subsets if we know that all clones will be present. We skip this on caching pools because they may not be; do the same when INCOMPLETE_CLONES is set. Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index daa5bc0fc8df4..ea30184626bf6 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -7736,8 +7736,8 @@ void ReplicatedBackend::calc_head_subsets( if (size) data_subset.insert(0, size); - if (get_parent()->get_pool().cache_mode != pg_pool_t::CACHEMODE_NONE) { - dout(10) << __func__ << ": caching enabled, skipping clone subsets" << dendl; + if (get_parent()->get_pool().allow_incomplete_clones()) { + dout(10) << __func__ << ": caching (was) enabled, skipping clone subsets" << dendl; return; } @@ -7796,8 +7796,8 @@ void ReplicatedBackend::calc_clone_subsets( if (size) data_subset.insert(0, size); - if (get_parent()->get_pool().cache_mode != pg_pool_t::CACHEMODE_NONE) { - dout(10) << __func__ << ": caching enabled, skipping clone subsets" << dendl; + if (get_parent()->get_pool().allow_incomplete_clones()) { + dout(10) << __func__ << ": caching (was) enabled, skipping clone subsets" << dendl; return; } -- 2.39.5