From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Fri, 28 Nov 2014 08:30:20 +0000 (+0800)
Subject: osd: tiering: avoid duplicate promotion on proxy read
X-Git-Tag: v0.92~33^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=650f1d989b0a9f974463f00faf769e0446bf226e;p=ceph.git

osd: tiering: avoid duplicate promotion on proxy read

Do not promote if it is already undergoing in maybe_handle_cache.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bec851d0b892..0a31c770c65b 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1802,6 +1802,11 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
     // Always proxy
     do_proxy_read(op);
 
+    // Avoid duplicate promotion
+    if (obc.get() && obc->is_blocked()) {
+      return true;
+    }
+
     // Promote too?
     switch (pool.info.min_read_recency_for_promote) {
     case 0: