From: Samuel Just <sjust@redhat.com>
Date: Tue, 15 Sep 2015 20:58:32 +0000 (-0700)
Subject: Revert "osd: purge the object from the cache when proxying and not promoting the op"
X-Git-Tag: v9.1.0~104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6014%2Fhead;p=ceph.git

Revert "osd: purge the object from the cache when proxying and not promoting the op"

Fixes: #13108
This reverts commit da68bb371f8b06b85a73077cd069a294193ac6c0.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bf9f4e50e663..248e69303d13 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2011,15 +2011,10 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op,
       }
 
       // Promote too?
-      bool promoting = false;
       if (!op->need_skip_promote()) {
-        promoting = maybe_promote(obc, missing_oid, oloc, in_hit_set,
-                                  pool.info.min_write_recency_for_promote,
-                                  OpRequestRef());
-      }
-      // purge the object in the cache if not promoting
-      if (!promoting) {
-	object_contexts.purge(obc->obs.oi.soid);
+        maybe_promote(obc, missing_oid, oloc, in_hit_set,
+	              pool.info.min_write_recency_for_promote,
+		      OpRequestRef());
       }
     } else {
       if (can_proxy_read)