]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
OSD/ReplicatedPG: Fixes unneccessary object promotion when deleting from the cache...
authorIgor Fedotov <ifedotov@mirantis.com>
Fri, 5 Feb 2016 14:25:43 +0000 (17:25 +0300)
committerIgor Fedotov <ifedotov@mirantis.com>
Mon, 8 Feb 2016 12:39:09 +0000 (15:39 +0300)
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
src/osd/ReplicatedPG.cc

index c5bdd422b70687f157d8b392c01d88a608967830..00746456cfba704a48c956cf043d5f3e2a1b64f0 100644 (file)
@@ -2147,7 +2147,7 @@ ReplicatedPG::cache_result_t ReplicatedPG::maybe_handle_cache_detail(
       return cache_result_t::BLOCKED_FULL;
     }
 
-    if (!hit_set) {
+    if (!hit_set && (must_promote || !op->need_skip_promote()) ) {
       promote_object(obc, missing_oid, oloc, op, promote_obc);
       return cache_result_t::BLOCKED_PROMOTE;
     } else if (op->may_write() || op->may_cache()) {