From: Igor Fedotov <ifedotov@mirantis.com>
Date: Mon, 8 Feb 2016 12:46:51 +0000 (+0300)
Subject: OSD/ReplicatePG: Fixes return value from maybe_handle_cache_detail() depending on... 
X-Git-Tag: v10.1.0~385^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7593%2Fhead;p=ceph.git

OSD/ReplicatePG: Fixes return value from maybe_handle_cache_detail() depending on maybe_promote() result

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 9205118f469..7c9ba80a272 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2160,11 +2160,12 @@ ReplicatedPG::cache_result_t ReplicatedPG::maybe_handle_cache_detail(
       }
 
       // Promote too?
-      if (!op->need_skip_promote()) {
-        maybe_promote(obc, missing_oid, oloc, in_hit_set,
+      if (!op->need_skip_promote() && 
+          maybe_promote(obc, missing_oid, oloc, in_hit_set,
 	              pool.info.min_write_recency_for_promote,
 		      OpRequestRef(),
-		      promote_obc);
+		      promote_obc)) {
+	return cache_result_t::BLOCKED_PROMOTE;
       }
       return cache_result_t::HANDLED_PROXY;
     } else {