Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mimic: os/bluestore: fix bloom filter num entry miscalculation in repairer #24339

Merged
merged 1 commit into from Oct 5, 2018
Merged

mimic: os/bluestore: fix bloom filter num entry miscalculation in repairer #24339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/os/bluestore/BlueStore.h
View file
Open in desktop
Expand Up @@ -2727,7 +2727,7 @@ class BlueStoreRepairer
granularity = round_up_to(granularity, min_alloc_size);
}

uint64_t entries = p2roundup(total, granularity) / granularity;
uint64_t entries = round_up_to(total, granularity) / granularity;
collections_bfs.resize(entries,
bloom_filter(BLOOM_FILTER_SALT_COUNT,
BLOOM_FILTER_TABLE_SIZE,
Expand Down
11 changes: 11 additions & 0 deletions src/test/objectstore/test_bluestore_types.cc
View file
Open in desktop
Expand Up @@ -1529,6 +1529,17 @@ TEST(BlueStoreRepairer, StoreSpaceTracker)
ASSERT_EQ(bmap.filter_out(extents), 3);
ASSERT_TRUE(bmap.is_used(cid));
ASSERT_TRUE(bmap.is_used(hoid));

BlueStoreRepairer::StoreSpaceTracker bmap2;
bmap2.init((uint64_t)0x3223b1d1000, 0x10000);
ASSERT_EQ(bmap2.granularity, 0x1a0000);
ASSERT_EQ(bmap2.collections_bfs.size(), 0x1edae4);
ASSERT_EQ(bmap2.objects_bfs.size(), 0x1edae4);
bmap2.set_used(0x3223b190000, 0x10000, cid, hoid);
ASSERT_TRUE(bmap2.is_used(cid, 0x3223b190000));
ASSERT_TRUE(bmap2.is_used(hoid, 0x3223b190000));
ASSERT_TRUE(bmap2.is_used(cid, 0x3223b19f000));
ASSERT_TRUE(bmap2.is_used(hoid, 0x3223b19ffff));
}

int main(int argc, char **argv) {
Expand Down