RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 05:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: introduce bluestore_blob_t::get_chunk_size method

Browse Source 
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
This commit is contained in:
Igor Fedotov 2016-06-24 16:30:45 +03:00 committed by Sage Weil
parent b788261b26
commit 0d83c935d8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/bluestore/BlueStore.cc
View File

@ -3501,7 +3501,7 @@ int BlueStore::_do_read(
} else {
for (auto reg : b2r_it->second) {
// determine how much of the blob to read
unsigned chunk_size = MAX(block_size, bptr->blob.get_csum_chunk_size());
uint64_t chunk_size = bptr->blob.get_chunk_size(block_size);
uint64_t r_off = reg.blob_xoffset;
uint64_t r_len = reg.length;
unsigned front = r_off % chunk_size;
@ -5634,7 +5634,7 @@ void BlueStore::_do_write_small(
<< " bstart 0x" << std::hex << bstart << std::dec << dendl;
// can we pad our head/tail out with zeros?
uint64_t chunk_size = MAX(block_size, b->blob.get_csum_chunk_size());
uint64_t chunk_size = b->blob.get_chunk_size(block_size);
uint64_t head_pad = offset % chunk_size;
if (head_pad && o->onode.has_any_lextents(offset - head_pad, chunk_size)) {
head_pad = 0;

18
src/os/bluestore/bluestore_types.h
View File

@ -233,6 +233,17 @@ struct bluestore_blob_t {
bool is_compressed() const {
return has_flag(FLAG_COMPRESSED);
}
bool has_csum() const {
return has_flag(FLAG_CSUM);
}
/// return chunk (i.e. min readable block) size for the blob
uint64_t get_chunk_size(uint64_t dev_block_size) {
return has_csum() ? MAX(dev_block_size, get_csum_chunk_size()) : dev_block_size;
}
uint32_t get_csum_chunk_size() const {
return 1 << csum_chunk_order;
}
uint32_t get_compressed_payload_length() const {
return is_compressed() ? compressed_length : 0;
}
@ -349,13 +360,6 @@ struct bluestore_blob_t {
return len;
}
bool has_csum() const {
return has_flag(FLAG_CSUM);
}
uint32_t get_csum_chunk_size() const {
return 1 << csum_chunk_order;
}
size_t get_csum_value_size() const {
switch (csum_type) {