RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17830 from Yan-waller/wip-walle-0920primarypg

Browse Source 
osd/PrimaryLogPG: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-09-22 12:24:07 +08:00 committed by GitHub
commit 3988bf26ed
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/PrimaryLogPG.cc
View File

@ -6866,8 +6866,8 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
map<snapid_t, interval_set<uint64_t> >::iterator iter =
snapset.clone_overlap.lower_bound(snapid);
interval_set<uint64_t> overlaps = iter->second;
assert(iter != snapset.clone_overlap.end());
interval_set<uint64_t> overlaps = iter->second;
for ( ;
iter != snapset.clone_overlap.end();
++iter)
@ -13231,7 +13231,6 @@ void PrimaryLogPG::scrub_snapshot_metadata(
{
dout(10) << __func__ << dendl;
coll_t c(info.pgid);
bool repair = state_test(PG_STATE_REPAIR);
bool deep_scrub = state_test(PG_STATE_DEEP_SCRUB);
const char *mode = (repair ? "repair": (deep_scrub ? "deep-scrub" : "scrub"));
@ -13244,8 +13243,6 @@ void PrimaryLogPG::scrub_snapshot_metadata(
unsigned missing = 0;
inconsistent_snapset_wrapper soid_error, head_error;
bufferlist last_data;
for (map<hobject_t,ScrubMap::object>::reverse_iterator
p = scrubmap.objects.rbegin(); p != scrubmap.objects.rend(); ++p) {
const hobject_t& soid = p->first;