From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 26 Nov 2014 01:57:03 +0000 (+0800)
Subject: osd: tiering: proxy instead of redirect read in writeback mode when the
X-Git-Tag: v0.92~33^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43f13af614a7e209fc122819df50723d64314088;p=ceph.git

osd: tiering: proxy instead of redirect read in writeback mode when the
cache pool is full

To preserve read op order

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 6154bb0459676..bec851d0b8920 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1783,8 +1783,8 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
     if (agent_state &&
 	agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL) {
       if (!op->may_write() && !op->may_cache() && !write_ordered) {
-	dout(20) << __func__ << " cache pool full, redirecting read" << dendl;
-	do_cache_redirect(op, obc);
+	dout(20) << __func__ << " cache pool full, proxying read" << dendl;
+	do_proxy_read(op);
 	return true;
       }
       dout(20) << __func__ << " cache pool full, waiting" << dendl;