RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes: #13108
This reverts commit da68bb371f.
This commit is contained in:
Samuel Just 2015-09-15 13:58:32 -07:00
parent 97ea80ca41
commit eab300868d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/ReplicatedPG.cc
View 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)