From: Samuel Just <sam.just@inktank.com>
Date: Thu, 14 Aug 2014 18:13:31 +0000 (-0700)
Subject: ReplicatedPG::maybe_handle_cache: do not forward RWORDERED reads
X-Git-Tag: v0.85~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2268%2Fhead;p=ceph.git

ReplicatedPG::maybe_handle_cache: do not forward RWORDERED reads

Even with READFORWARD, we can't forward RWORDERED reads.

Fixes: #9119
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index ed0bba0d96d..83d2b4da108 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1637,7 +1637,7 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
     }
 
     // Do writeback to the cache tier for writes
-    if (op->may_write()) {
+    if (op->may_write() || write_ordered) {
       if (agent_state &&
 	  agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL) {
 	dout(20) << __func__ << " cache pool full, waiting" << dendl;