RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore/StupidAllocator: rounded down len to an align boundary

Browse Source 
Fixes: http://tracker.ceph.com/issues/20660
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
This commit is contained in:
Zhu Shangzhong 2017-07-26 15:31:55 +08:00
parent 0988a34ad1
commit 656891891e
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/bluestore/StupidAllocator.cc
View File

@ -158,7 +158,7 @@ int64_t StupidAllocator::allocate_int(
if (skew)
skew = alloc_unit - skew;
*offset = p.get_start() + skew;
*length = MIN(MAX(alloc_unit, want_size), p.get_len() - skew);
*length = MIN(MAX(alloc_unit, want_size), P2ALIGN((p.get_len() - skew), alloc_unit));
if (cct->_conf->bluestore_debug_small_allocations) {
uint64_t max =
alloc_unit * (rand() % cct->_conf->bluestore_debug_small_allocations);

17
src/test/objectstore/Allocator_test.cc
View File

@ -273,6 +273,23 @@ TEST_P(AllocTest, test_alloc_hint_bmap)
EXPECT_EQ(1, (int)extents.size());
}
TEST_P(AllocTest, test_alloc_non_aligned_len)
{
int64_t block_size = 1 << 12;
int64_t blocks = (1 << 20) * 100;
int64_t want_size = 1 << 22;
int64_t alloc_unit = 1 << 20;
init_alloc(blocks*block_size, block_size);
alloc->init_add_free(0, 2097152);
alloc->init_add_free(2097152, 1064960);
alloc->init_add_free(3670016, 2097152);
EXPECT_EQ(0, alloc->reserve(want_size));
AllocExtentVector extents;
EXPECT_EQ(want_size, alloc->allocate(want_size, alloc_unit, 0, &extents));
}
INSTANTIATE_TEST_CASE_P(
Allocator,