From 22cc1b643f83edbfc0475f6da89cf4bd4c89aae1 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 (cherry picked from commit 41364711a66c89ce2e94435fe0d54eeda6092614) --- 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 8652fd3c533..570b9853a90 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -7710,8 +7710,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; } @@ -7770,8 +7770,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.47.3