]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd: purge the object from the cache when proxying and not promoting the op" 6014/head
authorSamuel Just <sjust@redhat.com>
Tue, 15 Sep 2015 20:58:32 +0000 (13:58 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 15 Sep 2015 21:04:09 +0000 (14:04 -0700)
Fixes: #13108
This reverts commit da68bb371f8b06b85a73077cd069a294193ac6c0.

src/osd/ReplicatedPG.cc

index bf9f4e50e663a917ead2668f7d9f03acff1e24c9..248e69303d13f10538cc0d41b8e86bbc714b56f9 100644 (file)
@@ -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)