Skip to content

Commit

Permalink
os/bluestore: enlarege aligned_size avoid too many vector(> IOV_MAX)
Browse files Browse the repository at this point in the history
Fixes: http://tracker.ceph.com/issues/21932
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
  • Loading branch information
majianpeng committed Nov 9, 2017
1 parent 51059a6 commit b064cda
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions src/os/bluestore/KernelDevice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,17 @@ int KernelDevice::write(
<< dendl;
assert(is_valid_io(off, len));

if ((!buffered || bl.get_num_buffers() >= IOV_MAX) &&
bl.rebuild_aligned_size_and_memory(block_size, block_size)) {
dout(20) << __func__ << " rebuilding buffer to be aligned" << dendl;
if ((!buffered || bl.get_num_buffers() >= IOV_MAX)) {
uint64_t aligned_size = block_size;
// Avoid after rebuild_aligned_size_and_memory, get_num_buffers() > IOV_MAX
if (bl.get_num_buffers() >= IOV_MAX && (len > (IOV_MAX * block_size))) {
aligned_size = ROUND_UP_TO(ROUND_UP_TO(len, IOV_MAX) / IOV_MAX, block_size);
dout(5) << __func__ << " because too many buffers, using " << aligned_size
<< " as aligned_size" << dendl;
}
if (bl.rebuild_aligned_size_and_memory(aligned_size, block_size)) {
dout(20) << __func__ << " rebuilding buffer to be aligned" << dendl;
}
}
dout(40) << "data: ";
bl.hexdump(*_dout);
Expand All @@ -619,10 +627,19 @@ int KernelDevice::aio_write(
assert(off < size);
assert(off + len <= size);

if ((!buffered || bl.get_num_buffers() >= IOV_MAX) &&
bl.rebuild_aligned_size_and_memory(block_size, block_size)) {
dout(20) << __func__ << " rebuilding buffer to be aligned" << dendl;
if ((!buffered || bl.get_num_buffers() >= IOV_MAX)) {
uint64_t aligned_size = block_size;
// Avoid after rebuild_aligned_size_and_memory, get_num_buffers() > IOV_MAX
if (bl.get_num_buffers() >= IOV_MAX && (len > (IOV_MAX * block_size))) {
aligned_size = ROUND_UP_TO(ROUND_UP_TO(len, IOV_MAX) / IOV_MAX, block_size);
dout(5) << __func__ << " because too many buffers, using " << aligned_size
<< " as aligned_size" << dendl;
}
if (bl.rebuild_aligned_size_and_memory(aligned_size, block_size)) {
dout(20) << __func__ << " rebuilding buffer to be aligned" << dendl;
}
}

dout(40) << "data: ";
bl.hexdump(*_dout);
*_dout << dendl;
Expand Down

0 comments on commit b064cda

Please sign in to comment.