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 d46bcc48690272be422ac6db82ee65eaa9cce97e..2de4b8308a79084ad27b9c21d03735fa93ab2f32 100644 (file)
--- 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;