From: Igor Fedotov <ifedotov@mirantis.com>
Date: Fri, 5 Feb 2016 14:25:43 +0000 (+0300)
Subject: OSD/ReplicatedPG: Fixes unneccessary object promotion when deleting from the cache... 
X-Git-Tag: v10.1.0~403^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12c083ed43e9dbd0fcffbf3b7f8b0cb69af91897;p=ceph.git

OSD/ReplicatedPG: Fixes unneccessary object promotion when deleting from the cache that lacks hit_set configured.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c5bdd422b706..00746456cfba 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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()) {