]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD/ReplicatePG: Fixes return value from maybe_handle_cache_detail() depending on... 7593/head
authorIgor Fedotov <ifedotov@mirantis.com>
Mon, 8 Feb 2016 12:46:51 +0000 (15:46 +0300)
committerIgor Fedotov <ifedotov@mirantis.com>
Tue, 9 Feb 2016 16:34:04 +0000 (19:34 +0300)
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com
src/osd/ReplicatedPG.cc

index 9205118f469089acd2a981d6b0943f0af4e0b998..7c9ba80a272956be5969fa7aa2850e25d13bbe5c 100644 (file)
@@ -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 {