Project

General

Profile

Bug #6101 » 0001-Don-t-assert-if-trimming-of-object-fails.patch

Daniel Poelzleithner, 02/11/2014 12:48 PM

View differences:

src/osd/ReplicatedPG.cc
int r = find_object_context(coid, &obc, false, NULL);
if (r == -ENOENT || coid.snap != obc->obs.oi.soid.snap) {
derr << __func__ << "could not find coid " << coid << dendl;
assert(0);
return NULL;
}
assert(r == 0);
assert(obc->registered);
......
dout(10) << "TrimmingObjects react trimming " << pos << dendl;
RepGather *repop = pg->trim_object(pos);
assert(repop);
if (!repop) {
pg->osd->clog.error() << "TrimmingObjects failed " << pos << "\n";
return discard_event();
}
repop->queue_snap_trimmer = true;
eversion_t old_last_update = pg->pg_log.get_head();
(10-10/11)