From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Feb 2016 12:13:19 +0000 (-0500)
Subject: osd/ReplicatedPG: respect must_promote in READFORWARD and READPROXY
X-Git-Tag: v10.1.0~306^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0858a5890eb7c6d2998493a187f820ae103940f;p=ceph.git

osd/ReplicatedPG: respect must_promote in READFORWARD and READPROXY

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d46bcc486902..2de4b8308a79 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2227,7 +2227,7 @@ ReplicatedPG::cache_result_t ReplicatedPG::maybe_handle_cache_detail(
 
   case pg_pool_t::CACHEMODE_READFORWARD:
     // Do writeback to the cache tier for writes
-    if (op->may_write() || write_ordered) {
+    if (op->may_write() || write_ordered || must_promote) {
       if (agent_state &&
 	  agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL) {
 	dout(20) << __func__ << " cache pool full, waiting" << dendl;
@@ -2244,7 +2244,7 @@ ReplicatedPG::cache_result_t ReplicatedPG::maybe_handle_cache_detail(
 
   case pg_pool_t::CACHEMODE_READPROXY:
     // Do writeback to the cache tier for writes
-    if (op->may_write() || write_ordered) {
+    if (op->may_write() || write_ordered || must_promote) {
       if (agent_state &&
 	  agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL) {
 	dout(20) << __func__ << " cache pool full, waiting" << dendl;