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 #2525 from ceph/wip-9487

Browse Source 
RFC: initialize purged_snaps on backfill

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Samuel Just 2014-10-01 13:45:27 -07:00
commit b1ca1f23ff
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osd/PG.cc
View File

@ -1560,6 +1560,9 @@ void PG::activate(ObjectStore::Transaction& t,
pi.hit_set = info.hit_set;
pi.stats.stats.clear();
// initialize peer with our purged_snaps.
pi.purged_snaps = info.purged_snaps;
m = new MOSDPGLog(
i->shard, pg_whoami.shard,
get_osdmap()->get_epoch(), pi);

2
src/osd/ReplicatedPG.cc
View File

@ -12395,7 +12395,7 @@ boost::statechart::result ReplicatedPG::WaitingOnReplicas::react(const SnapTrim&
context<SnapTrimmer>().need_share_pg_info = true;
// Back to the start
post_event(SnapTrim());
pg->queue_snap_trim();
return transit< NotTrimming >();
}