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

Merge pull request #6014 from athanatos/wip-13108

Browse Source 
Revert "osd: purge the object from the cache when proxying and not pr…

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-09-21 14:51:50 -04:00
commit e664547c22
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)