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

os/NewStore: combine contiguous overlays when writing all the overlays

Browse Source 
Combine contiguous overlay writes to reduce the numbers of WAL writes
and fs writes.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
This commit is contained in:
Zhiqiang Wang 2015-04-27 16:15:26 +08:00 committed by Sage Weil
parent 29ba720885
commit 793dcc396c
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/os/newstore/NewStore.cc
View File

@ -3140,8 +3140,7 @@ int NewStore::_do_write_all_overlays(TransContext *txc,
assert(f.length == o->onode.size);
for (map<uint64_t,overlay_t>::iterator p = o->onode.overlay_map.begin();
p != o->onode.overlay_map.end();
++p) {
p != o->onode.overlay_map.end(); ) {
dout(10) << __func__ << " overlay " << p->first
<< "~" << p->second << dendl;
string key;
@ -3157,6 +3156,31 @@ int NewStore::_do_write_all_overlays(TransContext *txc,
op->data.substr_of(bl, p->second.value_offset, p->second.length);
txc->t->rmkey(PREFIX_OVERLAY, key);
// Combine with later overlays if contiguous
map<uint64_t,overlay_t>::iterator prev = p, next = p;
++next;
while (next != o->onode.overlay_map.end()) {
if (prev->first + prev->second.length == next->first) {
dout(10) << __func__ << " combining overlay " << next->first
<< "~" << next->second << dendl;
string key_next;
get_overlay_key(o->onode.nid, next->second.key, &key_next);
bufferlist bl_next, bl_next_data;
db->get(PREFIX_OVERLAY, key_next, &bl_next);
bl_next_data.substr_of(bl_next, next->second.value_offset,
next->second.length);
bl.claim_append(bl_next_data);
txc->t->rmkey(PREFIX_OVERLAY, key_next);
++prev;
++next;
} else {
break;
}
}
p = next;
}
// this may double delete something we did above, but that's less