emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_check] detail and mapping trees weren't being counted properly for the metadata snap.

Browse Source 
This could result in block counts being unexpectedly non zero.
This commit is contained in:
Joe Thornber 2015-08-04 15:14:02 +01:00
parent b67cc29609
commit 5d28c05dc3
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
thin-provisioning/thin_check.cc
View File

@ -169,23 +169,9 @@ namespace {
bool clear_needs_check_flag_on_success; bool clear_needs_check_flag_on_success;
}; };
error_state check_space_map_counts(flags const &fs, nested_output &out, void count_trees(transaction_manager::ptr tm,
superblock_detail::superblock &sb, superblock_detail::superblock &sb,
block_manager<>::ptr bm, block_counter &bc) {
transaction_manager::ptr tm) {
block_counter bc;
// Count the superblock
bc.inc(superblock_detail::SUPERBLOCK_LOCATION);
// Count the metadata snap, if present
if (sb.metadata_snap_ != superblock_detail::SUPERBLOCK_LOCATION) {
bc.inc(sb.metadata_snap_);
superblock_detail::superblock snap = read_superblock(bm, sb.metadata_snap_);
bc.inc(snap.data_mapping_root_);
bc.inc(snap.device_details_root_);
}
// Count the device tree // Count the device tree
{ {
@ -202,6 +188,25 @@ namespace {
mapping_tree_detail::block_traits::ref_counter(tm->get_sm())); mapping_tree_detail::block_traits::ref_counter(tm->get_sm()));
count_btree_blocks(mtree, bc, vc); count_btree_blocks(mtree, bc, vc);
} }
}
error_state check_space_map_counts(flags const &fs, nested_output &out,
superblock_detail::superblock &sb,
block_manager<>::ptr bm,
transaction_manager::ptr tm) {
block_counter bc;
// Count the superblock
bc.inc(superblock_detail::SUPERBLOCK_LOCATION);
count_trees(tm, sb, bc);
// Count the metadata snap, if present
if (sb.metadata_snap_ != superblock_detail::SUPERBLOCK_LOCATION) {
bc.inc(sb.metadata_snap_);
superblock_detail::superblock snap = read_superblock(bm, sb.metadata_snap_);
count_trees(tm, snap, bc);
}
// Count the metadata space map // Count the metadata space map
{ {