RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-15 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PrimaryLogPG: trim_objects: only filter SnapSet::snaps for pre-octopus

Browse Source 
For octopus and later, we don't need SnapSet::snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-06-11 13:52:32 -05:00
parent b1a5bff4a8
commit c88d860dce
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/PrimaryLogPG.cc
View File

@ -4432,8 +4432,13 @@ int PrimaryLogPG::trim_object(
head_obc->obs.oi = object_info_t(head_oid);
t->remove(head_oid);
} else {
dout(10) << coid << " filtering snapset on " << head_oid << dendl;
snapset.filter(pool.info);
if (get_osdmap()->require_osd_release < ceph_release_t::octopus) {
// filter SnapSet::snaps for the benefit of pre-octopus
// peers. This is perhaps overly conservative in that I'm not
// certain they need this, but let's be conservative here.
dout(10) << coid << " filtering snapset on " << head_oid << dendl;
snapset.filter(pool.info);
}
dout(10) << coid << " writing updated snapset on " << head_oid
<< ", snapset is " << snapset << dendl;
ctx->log.push_back(