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

Merge pull request #12447 from ifed01/wip-bluestore-fix-reshard2

Browse Source 
os/bluestore: avoid resharding if the last shard size fall below shar…

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-13 11:47:42 -06:00 committed by GitHub
commit c6198c3e7e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,23 +1608,28 @@ bool BlueStore::ExtentMap::update(Onode *o, KeyValueDB::Transaction t,
endoff = n->offset;
}
bufferlist bl;
unsigned n;
if (encode_some(p->offset, endoff - p->offset, bl, &n)) {
unsigned nn;
if (encode_some(p->offset, endoff - p->offset, bl, &nn)) {
return true;
}
size_t len = bl.length();
dout(20) << __func__ << " shard 0x" << std::hex
<< p->offset << std::dec << " is " << len
<< " bytes (was " << p->shard_info->bytes << ") from " << n
<< " bytes (was " << p->shard_info->bytes << ") from " << nn
<< " extents" << dendl;
//indicate need for reshard if force mode selected, len > shard_max size OR
//non-last shard size is below the min threshold. The last check is to avoid potential
//unneeded reshardings since this might happen permanently.
if (!force &&
(len > g_conf->bluestore_extent_map_shard_max_size ||
len < g_conf->bluestore_extent_map_shard_min_size)) {
(n != shards.end() && len < g_conf->bluestore_extent_map_shard_min_size)
)) {
return true;
}
assert(p->shard_info->offset == p->offset);
p->shard_info->bytes = len;
p->shard_info->extents = n;
p->shard_info->extents = nn;
t->set(PREFIX_OBJ, p->key, bl);
p->dirty = false;
}