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

osd/PrimaryLogPG: filter snapc.snaps up front

Browse Source 
No reason to wait for make_writeable(); ensure we have a valid snapc
from the start.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-02-20 18:22:39 -06:00
parent 1d87287d45
commit 10f8615e8f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/PrimaryLogPG.cc
View File

@ -3044,6 +3044,7 @@ void PrimaryLogPG::execute_ctx(OpContext *ctx)
// client specified snapc
ctx->snapc.seq = m->get_snap_seq();
ctx->snapc.snaps = m->get_snaps();
filter_snapc(ctx->snapc.snaps);
}
if ((m->has_flag(CEPH_OSD_FLAG_ORDERSNAP)) &&
ctx->snapc.seq < obc->ssc->snapset.seq) {
@ -6642,12 +6643,10 @@ void PrimaryLogPG::make_writeable(OpContext *ctx)
if (ctx->new_snapset.seq > snapc.seq) {
snapc.seq = ctx->new_snapset.seq;
snapc.snaps = ctx->new_snapset.snaps;
filter_snapc(snapc.snaps);
dout(10) << " using newer snapc " << snapc << dendl;
}
if (ctx->obs->exists)
filter_snapc(snapc.snaps);
if ((ctx->obs->exists && !ctx->obs->oi.is_whiteout()) && // head exist(ed)
snapc.snaps.size() && // there are snaps
!ctx->cache_evict &&