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

osd/ReplicatedPG: fix copy-get iteration of omap keys

Browse Source 
We need to call upper_bound() before checking if the iterator is valid!

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-12-23 12:52:34 -08:00
parent 0c9acf147d
commit 8fc66a4ab2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/ReplicatedPG.cc
View File

@ -4682,8 +4682,8 @@ int ReplicatedPG::fill_in_copy_get(bufferlist::iterator& bp, OSDOp& osd_op,
ObjectMap::ObjectMapIterator iter =
osd->store->get_omap_iterator(coll, oi.soid);
assert(iter);
iter->upper_bound(cursor.omap_offset);
if (iter->valid()) {
iter->upper_bound(cursor.omap_offset);
for (; left > 0 && iter->valid(); iter->next()) {
out_omap.insert(make_pair(iter->key(), iter->value()));
left -= iter->key().length() + 4 + iter->value().length() + 4;
@ -4698,10 +4698,11 @@ int ReplicatedPG::fill_in_copy_get(bufferlist::iterator& bp, OSDOp& osd_op,
}
dout(20) << " cursor.is_complete=" << cursor.is_complete()
<< " " << out_attrs.size() << " attrs"
<< " " << bl.length() << " bytes"
<< " " << out_omap.size() << " keys"
<< dendl;
<< " " << out_attrs.size() << " attrs"
<< " " << bl.length() << " bytes"
<< " " << reply_obj.omap_header.length() << " omap header bytes"
<< " " << out_omap.size() << " keys"
<< dendl;
reply_obj.cursor = cursor;
if (classic) {
if (reply_obj.omap_header.length() > 0) {