Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: avoid unnecessary call to init_csum() #12015

Merged
merged 2 commits into from Nov 17, 2016
Merged

os/bluestore: avoid unnecessary call to init_csum() #12015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5beb99e
os/bluestore: avoid unnecessary call to init_csum()
xiexingguo Nov 16, 2016
eedb3f4
os/bluestore: more readability improvements
xiexingguo Nov 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Expand Up @@ -7524,19 +7524,16 @@ void BlueStore::_do_write_small(
blp.copy(length, bl);

// look for an existing mutable blob we can use
BlobRef b = 0;
boost::intrusive::set<Extent>::iterator ep =
o->extent_map.seek_lextent(offset);
auto ep = o->extent_map.seek_lextent(offset);
if (ep != o->extent_map.extent_map.begin()) {
--ep;
b = ep->blob;
if (ep->logical_offset - ep->blob_offset +
b->get_blob().get_ondisk_length() <= offset) {
if (ep->blob_end() <= offset) {
++ep;
}
}
BlobRef b;
while (ep != o->extent_map.extent_map.end()) {
if (ep->logical_offset >= ep->blob_offset + end) {
if (ep->blob_start() >= end) {
break;
}
b = ep->blob;
Expand All @@ -7551,7 +7548,7 @@ void BlueStore::_do_write_small(
++ep;
continue;
}
uint64_t bstart = ep->logical_offset - ep->blob_offset;
uint64_t bstart = ep->blob_start();
dout(20) << __func__ << " considering " << *b
<< " bstart 0x" << std::hex << bstart << std::dec << dendl;

Expand Down Expand Up @@ -7906,7 +7903,7 @@ int BlueStore::_do_alloc_write(
<< " csum_length 0x" << std::hex << csum_length << std::dec
<< dendl;

if (csum) {
if (csum != Checksummer::CSUM_NONE) {
dblob.init_csum(csum, csum_order, csum_length);
dblob.calc_csum(b_off, *l);
}
Expand Down Expand Up @@ -7992,7 +7989,7 @@ void BlueStore::_wctx_finish(
}
}
delete &lo;
if (b->id >= 0 && b->get_ref_map().empty()) {
if (b->is_spanning() && b->get_ref_map().empty()) {
dout(20) << __func__ << " spanning_blob_map removing empty " << *b
<< dendl;
auto it = o->extent_map.spanning_blob_map.find(b->id);
Expand Down