From c42232e3539fc4682e8fec3e064b21acbcc996ed Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Jul 2014 18:23:56 -0700 Subject: [PATCH] osd/ReplicatedPG: do not complain about missing clones when INCOMPLETE_CLONES is set When scrubbing, do not complain about missing cloens when we are in a caching mode *or* when the INCOMPLETE_CLONES flag is set. Both are indicators that we may be missing clones and that that is okay. Fixes: #8882 Signed-off-by: Sage Weil (cherry picked from commit 956f28721dd98c5fb9eb410f4fe9e320b3f3eed3) --- src/osd/ReplicatedPG.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index b198b4d6f27eb..8652fd3c5339b 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -11668,7 +11668,7 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap) // did we finish the last oid? if (head != hobject_t() && - pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE) { + !pool.info.allow_incomplete_clones()) { osd->clog.error() << mode << " " << info.pgid << " " << head << " missing clones"; ++scrubber.shallow_errors; @@ -11729,7 +11729,7 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap) // if (!next_clone.is_min() && next_clone != soid && - pool.info.cache_mode != pg_pool_t::CACHEMODE_NONE) { + pool.info.allow_incomplete_clones()) { // it is okay to be missing one or more clones in a cache tier. // skip higher-numbered clones in the list. while (curclone != snapset.clones.rend() && @@ -11817,7 +11817,7 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap) } if (!next_clone.is_min() && - pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE) { + !pool.info.allow_incomplete_clones()) { osd->clog.error() << mode << " " << info.pgid << " expected clone " << next_clone; ++scrubber.shallow_errors; -- 2.39.5