From: Sage Weil Date: Sun, 30 Mar 2014 05:28:13 +0000 (-0700) Subject: osd/ReplicatedPG: fix cache tier scrub again X-Git-Tag: v0.79~50 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e672c52b4f8b945a516f2eec006e33665a08f045;p=ceph.git osd/ReplicatedPG: fix cache tier scrub again This condition was flipped from commit eb71924ea27e78d97bd45674ef5e6a7f and the test case in c3292e48483d861148322590ea1f05afd28cc2d3 still didn't catch it. (It does now.) Signed-off-by: Sage Weil --- diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 23248ee56d78..27528c846430 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -11151,7 +11151,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.cache_mode != pg_pool_t::CACHEMODE_NONE) { // 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() &&