Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/os/bluestore/BlueStore.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2919,6 +2919,7 @@ void BlueStore::Blob::split(Collection *coll, uint32_t blob_offset, Blob *r)
{
dout(10) << __func__ << " 0x" << std::hex << blob_offset << std::dec
<< " start " << *this << dendl;
ceph_assert(r);
ceph_assert(blob.can_split());
ceph_assert(used_in_blob.can_split());
bluestore_blob_t &lb = dirty_blob();
Expand All @@ -2930,6 +2931,10 @@ void BlueStore::Blob::split(Collection *coll, uint32_t blob_offset, Blob *r)

lb.split(blob_offset, rb);

maybe_prune_tail(); // we might get tail-to-prune after splitting
r->maybe_prune_tail(); // likely redundant (as we tend to prune original blob beforehand)
// but let it be

dout(10) << __func__ << " 0x" << std::hex << blob_offset << std::dec
<< " finish " << *this << dendl;
dout(10) << __func__ << " 0x" << std::hex << blob_offset << std::dec
Expand Down Expand Up @@ -3588,9 +3593,14 @@ BlueStore::ExtentMap::reshard_decision(uint32_t segment_size) {
<< needs_reshard_end << ") segment 0x" << segment_size << std::dec
<< " of " << onode->onode.extent_map_shards.size()
<< " shards on " << onode->oid << dendl;
for (auto& p : spanning_blob_map) {
dout(20) << __func__ << " spanning blob " << p.first << " " << *p.second
<< dendl;
const int span_blob_log_level = 20;
if (cct->_conf->subsys.should_gather<ceph_subsys_bluestore, span_blob_log_level>()) {
for (auto& p : spanning_blob_map) {
dout(span_blob_log_level) << __func__
<< " spanning blob "
<< p.first << " " << *p.second
<< dendl;
}
}
// determine shard index range
unsigned shard_index_begin = 0, shard_index_end = 0;
Expand Down
Loading