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

Merge pull request #266 from ceph/wip-4949

Browse Source 
osd: don't assert if get_omap_iterator() returns NULL

Reviewed-by: Sam Just <sam.just@inktank.com>
This commit is contained in:
athanatos 2013-05-08 12:15:30 -07:00
commit 0d8f7a092f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/ReplicatedPG.cc
View File

@ -2922,7 +2922,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
ObjectMap::ObjectMapIterator iter = osd->store->get_omap_iterator(
coll, soid
);
assert(iter);
if (!iter) {
result = -ENOENT;
goto fail;
}
iter->upper_bound(start_after);
if (filter_prefix >= start_after) iter->lower_bound(filter_prefix);
for (uint64_t i = 0;